From 6c950a38e65eb397750ceb899facfc182781b9f0 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 16 Jan 2024 09:18:14 -0800 Subject: [PATCH 001/568] update release information (#5823) Co-authored-by: github-actions --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index d056d700c9e..5b2cb6a9adb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,8 +8,8 @@ https://github.com/dotnet/dotnet-monitor - 8.1.0 - alpha + 9.0.0 + preview 1 true From 2d994ca2e242fddc2fc82e532981456405a2df42 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 16 Jan 2024 09:19:24 -0800 Subject: [PATCH 002/568] [feature/9.x] Update dependencies from dotnet/diagnostics (#5829) * Update dependencies from https://github.com/dotnet/diagnostics build 20240112.1 Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe From Version 8.0.0-preview.24061.1 -> To Version 8.0.0-preview.24062.1 * Update dependencies from https://github.com/dotnet/diagnostics build 20240112.1 Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe From Version 8.0.0-preview.24061.1 -> To Version 8.0.0-preview.24062.1 * Update dependencies from https://github.com/dotnet/diagnostics build 20240112.1 Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe From Version 8.0.0-preview.24061.1 -> To Version 8.0.0-preview.24062.1 * Update dependencies from https://github.com/dotnet/diagnostics build 20240115.1 Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe From Version 8.0.0-preview.24061.1 -> To Version 8.0.0-preview.24065.1 --------- Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 6 ------ eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index 20271a54e8f..208db0ebcae 100644 --- a/NuGet.config +++ b/NuGet.config @@ -12,9 +12,6 @@ - - - @@ -33,9 +30,6 @@ - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 65b961f4911..fc37d39c56f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 8e941eb42f819adb116b881195158b3887a70a1c - + https://github.com/dotnet/diagnostics - 3014cbe58b00bd2e8da9e8336cd791e99a68ce9a + 70f954cd70ed1701e9dc55578fde1b3c48b1d32b - + https://github.com/dotnet/diagnostics - 3014cbe58b00bd2e8da9e8336cd791e99a68ce9a + 70f954cd70ed1701e9dc55578fde1b3c48b1d32b https://github.com/dotnet/command-line-api diff --git a/eng/Versions.props b/eng/Versions.props index 5b2cb6a9adb..2ae3cdf6b4e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -62,8 +62,8 @@ 2.0.0-beta4.24059.2 - 8.0.0-preview.24061.1 - 8.0.0-preview.24061.1 + 8.0.0-preview.24065.1 + 8.0.0-preview.24065.1 8.0.102-servicing.24061.7 From 0c3c99992be68322c8ab75e47c3b02840ea0320c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 16 Jan 2024 09:20:07 -0800 Subject: [PATCH 003/568] Update dependencies from https://github.com/dotnet/symstore build 20240115.1 (#5836) Microsoft.FileFormats From Version 1.0.505801 -> To Version 1.0.506501 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fc37d39c56f..9afe41c788f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -46,9 +46,9 @@ https://github.com/dotnet/arcade 888985fb9a9ae4cb30bca75f98af9126c839e660 - + https://github.com/dotnet/symstore - b89d84ab3a08678acb113c86452fcd0037d26f97 + 39e2ea2473d44b2dc272543277adbce89f79e064 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 2ae3cdf6b4e..ca790c3172b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -72,7 +72,7 @@ 8.0.1 8.0.1-servicing.23580.1 - 1.0.505801 + 1.0.506501 $(MicrosoftNETCoreApp31Version) From 564c2985b30f50f012f7d4cbeb2b0817864ec7ee Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 16 Jan 2024 13:00:18 -0800 Subject: [PATCH 004/568] [feature/9.x] Update dependencies from dotnet/arcade (#5826) * Update dependencies from https://github.com/dotnet/arcade build 20240112.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.24060.4 -> To Version 9.0.0-beta.24062.3 * Update dependencies from https://github.com/dotnet/arcade build 20240112.5 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.24060.4 -> To Version 9.0.0-beta.24062.5 * Update dependencies from https://github.com/dotnet/arcade build 20240112.5 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.24060.4 -> To Version 9.0.0-beta.24062.5 * Update dependencies from https://github.com/dotnet/arcade build 20240112.5 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.24060.4 -> To Version 9.0.0-beta.24062.5 * Update dependencies from https://github.com/dotnet/arcade build 20240115.5 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.24060.4 -> To Version 9.0.0-beta.24065.5 --------- Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 20 ++--- eng/Versions.props | 6 +- eng/common/build.cmd | 3 + eng/common/build.ps1 | 3 + eng/common/build.sh | 10 ++- eng/common/cross/build-rootfs.sh | 8 +- eng/common/cross/riscv64/sources.list.sid | 2 +- eng/common/cross/riscv64/tizen/tizen.patch | 9 +++ eng/common/cross/tizen-build-rootfs.sh | 21 +++++ eng/common/cross/tizen-fetch.sh | 17 +++- eng/common/cross/toolchain.cmake | 13 ++- eng/common/helixpublish.proj | 1 + eng/common/internal/Directory.Build.props | 2 + eng/common/internal/Tools.csproj | 2 + .../post-build/check-channel-consistency.ps1 | 2 +- eng/common/post-build/redact-logs.ps1 | 81 +++++++++++++++++++ eng/common/sdl/trim-assets-version.ps1 | 2 +- eng/common/templates/job/job.yml | 2 +- .../templates/job/publish-build-assets.yml | 8 +- .../templates/job/source-index-stage1.yml | 10 +-- .../templates/post-build/common-variables.yml | 2 + .../templates/post-build/post-build.yml | 1 + eng/common/templates/steps/publish-logs.yml | 28 ++++++- eng/common/templates/steps/source-build.yml | 4 +- eng/common/tools.ps1 | 38 ++++----- eng/common/tools.sh | 19 ++--- global.json | 6 +- 27 files changed, 249 insertions(+), 71 deletions(-) create mode 100644 eng/common/build.cmd create mode 100644 eng/common/cross/riscv64/tizen/tizen.patch create mode 100644 eng/common/post-build/redact-logs.ps1 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9afe41c788f..7c2042607f6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,29 +22,29 @@ https://github.com/dotnet/roslyn-analyzers b4d9a1334d5189172977ba8fddd00bda70161e4a - + https://github.com/dotnet/arcade - 888985fb9a9ae4cb30bca75f98af9126c839e660 + 0d95a90310e5e2afbef31f4ca1c4b692698cd686 - + https://github.com/dotnet/arcade - 888985fb9a9ae4cb30bca75f98af9126c839e660 + 0d95a90310e5e2afbef31f4ca1c4b692698cd686 - + https://github.com/dotnet/arcade - 888985fb9a9ae4cb30bca75f98af9126c839e660 + 0d95a90310e5e2afbef31f4ca1c4b692698cd686 - + https://github.com/dotnet/arcade - 888985fb9a9ae4cb30bca75f98af9126c839e660 + 0d95a90310e5e2afbef31f4ca1c4b692698cd686 https://github.com/dotnet/installer 79cfea2c03ab0bf14dccc668aa3c41a5fef5119f - + https://github.com/dotnet/arcade - 888985fb9a9ae4cb30bca75f98af9126c839e660 + 0d95a90310e5e2afbef31f4ca1c4b692698cd686 https://github.com/dotnet/symstore diff --git a/eng/Versions.props b/eng/Versions.props index ca790c3172b..c7d675a6f0d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,9 +53,9 @@ --> - 8.0.0-beta.24060.4 - 8.0.0-beta.24060.4 - 8.0.0-beta.24060.4 + 9.0.0-beta.24065.5 + 9.0.0-beta.24065.5 + 9.0.0-beta.24065.5 8.0.1 8.0.1-servicing.23580.8 diff --git a/eng/common/build.cmd b/eng/common/build.cmd new file mode 100644 index 00000000000..99daf368aba --- /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/build.ps1 b/eng/common/build.ps1 index 33a6f2d0e24..066044f62f2 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 50af40cdd2c..5ce01dd161a 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 @@ -105,7 +106,7 @@ while [[ $# > 0 ]]; do -binarylog|-bl) binary_log=true ;; - -excludeCIBinarylog|-nobl) + -excludecibinarylog|-nobl) exclude_ci_binary_log=true ;; -pipelineslog|-pl) @@ -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/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index 9caf9b021db..9b2791cf568 100644 --- 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) @@ -487,7 +487,7 @@ if [[ "$__CodeName" == "alpine" ]]; then -X "http://dl-cdn.alpinelinux.org/alpine/$version/main" \ -X "http://dl-cdn.alpinelinux.org/alpine/$version/community" \ -U $__ApkSignatureArg --root "$__RootfsDir" --arch "$__AlpineArch" \ - search 'llvm*-libs' | sort | tail -1 | sed 's/-[^-]*//2g')" + search 'llvm*-libs' | grep -E '^llvm' | sort | tail -1 | sed 's/-[^-]*//2g')" fi # install all packages in one go diff --git a/eng/common/cross/riscv64/sources.list.sid b/eng/common/cross/riscv64/sources.list.sid index 65f730d224c..b5f7a7e6e1e 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/cross/riscv64/tizen/tizen.patch b/eng/common/cross/riscv64/tizen/tizen.patch new file mode 100644 index 00000000000..eb6d1c07470 --- /dev/null +++ b/eng/common/cross/riscv64/tizen/tizen.patch @@ -0,0 +1,9 @@ +diff -u -r a/usr/lib/libc.so b/usr/lib/libc.so +--- a/usr/lib64/libc.so 2016-12-30 23:00:08.284951863 +0900 ++++ b/usr/lib64/libc.so 2016-12-30 23:00:32.140951815 +0900 +@@ -2,4 +2,4 @@ + Use the shared library, but some functions are only in + the static library, so try that secondarily. */ + OUTPUT_FORMAT(elf64-littleriscv) +-GROUP ( /lib64/libc.so.6 /usr/lib64/libc_nonshared.a AS_NEEDED ( /lib64/ld-linux-riscv64-lp64d.so.1 ) ) ++GROUP ( libc.so.6 libc_nonshared.a AS_NEEDED ( ld-linux-riscv64-lp64d.so.1 ) ) diff --git a/eng/common/cross/tizen-build-rootfs.sh b/eng/common/cross/tizen-build-rootfs.sh index ac84173d44f..ba31c93285f 100644 --- a/eng/common/cross/tizen-build-rootfs.sh +++ b/eng/common/cross/tizen-build-rootfs.sh @@ -22,6 +22,10 @@ case "$ARCH" in TIZEN_ARCH="x86_64" LINK_ARCH="x86" ;; + riscv64) + TIZEN_ARCH="riscv64" + LINK_ARCH="riscv" + ;; *) echo "Unsupported architecture for tizen: $ARCH" exit 1 @@ -58,4 +62,21 @@ rm -rf $TIZEN_TMP_DIR echo ">>Start configuring Tizen rootfs" ln -sfn asm-${LINK_ARCH} ./usr/include/asm patch -p1 < $__TIZEN_CROSSDIR/tizen.patch +if [[ "$TIZEN_ARCH" == "riscv64" ]]; then + echo "Fixing broken symlinks in $PWD" + rm ./usr/lib64/libresolv.so + ln -s ../../lib64/libresolv.so.2 ./usr/lib64/libresolv.so + rm ./usr/lib64/libpthread.so + ln -s ../../lib64/libpthread.so.0 ./usr/lib64/libpthread.so + rm ./usr/lib64/libdl.so + ln -s ../../lib64/libdl.so.2 ./usr/lib64/libdl.so + rm ./usr/lib64/libutil.so + ln -s ../../lib64/libutil.so.1 ./usr/lib64/libutil.so + rm ./usr/lib64/libm.so + ln -s ../../lib64/libm.so.6 ./usr/lib64/libm.so + rm ./usr/lib64/librt.so + ln -s ../../lib64/librt.so.1 ./usr/lib64/librt.so + rm ./lib/ld-linux-riscv64-lp64d.so.1 + ln -s ../lib64/ld-linux-riscv64-lp64d.so.1 ./lib/ld-linux-riscv64-lp64d.so.1 +fi echo "< diff --git a/eng/common/internal/Directory.Build.props b/eng/common/internal/Directory.Build.props index dbf99d82a5c..a735fe9a133 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 7f5ce6d6081..8fa77e5b181 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/eng/common/post-build/check-channel-consistency.ps1 b/eng/common/post-build/check-channel-consistency.ps1 index 63f3464c986..1728f035a93 100644 --- a/eng/common/post-build/check-channel-consistency.ps1 +++ b/eng/common/post-build/check-channel-consistency.ps1 @@ -7,7 +7,7 @@ try { . $PSScriptRoot\post-build-utils.ps1 if ($PromoteToChannels -eq "") { - Write-PipelineTaskError -Type 'warning' -Message "This build won't publish assets as it's not configured to any Maestro channel. If that wasn't intended use Darc to configure a default channel using add-default-channel for this branch or to promote it to a channel using add-build-to-channel. See https://github.com/dotnet/arcade/blob/master/Documentation/Darc.md#assigning-an-individual-build-to-a-channel for more info." + Write-PipelineTaskError -Type 'warning' -Message "This build won't publish assets as it's not configured to any Maestro channel. If that wasn't intended use Darc to configure a default channel using add-default-channel for this branch or to promote it to a channel using add-build-to-channel. See https://github.com/dotnet/arcade/blob/main/Documentation/Darc.md#assigning-an-individual-build-to-a-channel for more info." ExitWithExitCode 0 } diff --git a/eng/common/post-build/redact-logs.ps1 b/eng/common/post-build/redact-logs.ps1 new file mode 100644 index 00000000000..82d91f6fd02 --- /dev/null +++ b/eng/common/post-build/redact-logs.ps1 @@ -0,0 +1,81 @@ +[CmdletBinding(PositionalBinding=$False)] +param( + [Parameter(Mandatory=$true, Position=0)][string] $InputPath, + [Parameter(Mandatory=$true)][string] $BinlogToolVersion, + [Parameter(Mandatory=$false)][string] $DotnetPath, + [Parameter(Mandatory=$false)][string] $PackageFeed = 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json', + # File with strings to redact - separated by newlines. + # For comments start the line with '# ' - such lines are ignored + [Parameter(Mandatory=$false)][string] $TokensFilePath, + [Parameter(ValueFromRemainingArguments=$true)][String[]]$TokensToRedact +) + +try { + . $PSScriptRoot\post-build-utils.ps1 + + $packageName = 'binlogtool' + + $dotnet = $DotnetPath + + if (!$dotnet) { + $dotnetRoot = InitializeDotNetCli -install:$true + $dotnet = "$dotnetRoot\dotnet.exe" + } + + $toolList = & "$dotnet" tool list -g + + if ($toolList -like "*$packageName*") { + & "$dotnet" tool uninstall $packageName -g + } + + $toolPath = "$PSScriptRoot\..\..\..\.tools" + $verbosity = 'minimal' + + New-Item -ItemType Directory -Force -Path $toolPath + + Push-Location -Path $toolPath + + try { + Write-Host "Installing Binlog redactor CLI..." + Write-Host "'$dotnet' new tool-manifest" + & "$dotnet" new tool-manifest + Write-Host "'$dotnet' tool install $packageName --local --add-source '$PackageFeed' -v $verbosity --version $BinlogToolVersion" + & "$dotnet" tool install $packageName --local --add-source "$PackageFeed" -v $verbosity --version $BinlogToolVersion + + if (Test-Path $TokensFilePath) { + Write-Host "Adding additional sensitive data for redaction from file: " $TokensFilePath + $TokensToRedact += Get-Content -Path $TokensFilePath | Foreach {$_.Trim()} | Where { $_ -notmatch "^# " } + } + + $optionalParams = [System.Collections.ArrayList]::new() + + Foreach ($p in $TokensToRedact) + { + if($p -match '^\$\(.*\)$') + { + Write-Host ("Ignoring token {0} as it is probably unexpanded AzDO variable" -f $p) + } + elseif($p) + { + $optionalParams.Add("-p:" + $p) | Out-Null + } + } + + & $dotnet binlogtool redact --input:$InputPath --recurse --in-place ` + @optionalParams + + if ($LastExitCode -ne 0) { + Write-PipelineTelemetryError -Category 'Redactor' -Type 'warning' -Message "Problems using Redactor tool (exit code: $LastExitCode). But ignoring them now." + } + } + finally { + Pop-Location + } + + Write-Host 'done.' +} +catch { + Write-Host $_ + Write-PipelineTelemetryError -Category 'Redactor' -Message "There was an error while trying to redact logs. Error: $_" + ExitWithExitCode 1 +} diff --git a/eng/common/sdl/trim-assets-version.ps1 b/eng/common/sdl/trim-assets-version.ps1 index a2e00487704..0daa2a9e946 100644 --- a/eng/common/sdl/trim-assets-version.ps1 +++ b/eng/common/sdl/trim-assets-version.ps1 @@ -72,4 +72,4 @@ catch { Write-Host $_ Write-PipelineTelemetryError -Force -Category 'Sdl' -Message $_ ExitWithExitCode 1 -} \ No newline at end of file +} diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index e24ca2f46f9..01c0dd995e4 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -154,7 +154,7 @@ jobs: displayName: RichCodeNav Upload inputs: languages: ${{ coalesce(parameters.richCodeNavigationLanguage, 'csharp') }} - environment: ${{ coalesce(parameters.richCodeNavigationEnvironment, 'production') }} + environment: ${{ coalesce(parameters.richCodeNavigationEnvironment, 'internal') }} richNavLogOutputDirectory: $(Build.SourcesDirectory)/artifacts/bin uploadRichNavArtifacts: ${{ coalesce(parameters.richCodeNavigationUploadArtifacts, false) }} continueOnError: true diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml index fa5446c093d..3115990d511 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -48,8 +48,8 @@ jobs: - group: AzureDevOps-Artifact-Feeds-Pats - name: runCodesignValidationInjection value: false - - ${{ if eq(parameters.publishAssetsImmediately, 'true') }}: - - template: /eng/common/templates/post-build/common-variables.yml + # unconditional - needed for logs publishing (redactor tool version) + - template: /eng/common/templates/post-build/common-variables.yml pool: # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) @@ -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/templates/job/source-index-stage1.yml b/eng/common/templates/job/source-index-stage1.yml index b98202aa02d..79523366262 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/templates/post-build/common-variables.yml b/eng/common/templates/post-build/common-variables.yml index 173914f2364..b9ede10bf09 100644 --- a/eng/common/templates/post-build/common-variables.yml +++ b/eng/common/templates/post-build/common-variables.yml @@ -17,6 +17,8 @@ variables: value: 3.0.0 - name: SymbolToolVersion value: 1.0.1 + - name: BinlogToolVersion + value: 1.0.11 - name: runCodesignValidationInjection value: false diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index 3f74abf7ce0..bbc010fe732 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -187,6 +187,7 @@ stages: parameters: StageLabel: 'Validation' JobLabel: 'Signing' + BinlogToolVersion: $(BinlogToolVersion) - job: displayName: SourceLink Validation diff --git a/eng/common/templates/steps/publish-logs.yml b/eng/common/templates/steps/publish-logs.yml index 88f238f36bf..80861297ddc 100644 --- a/eng/common/templates/steps/publish-logs.yml +++ b/eng/common/templates/steps/publish-logs.yml @@ -1,6 +1,9 @@ parameters: StageLabel: '' JobLabel: '' + CustomSensitiveDataList: '' + # A default - in case value from eng/common/templates/post-build/common-variables.yml is not passed + BinlogToolVersion: '1.0.11' steps: - task: Powershell@2 @@ -12,7 +15,30 @@ 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() + - task: PublishBuildArtifacts@1 displayName: Publish Logs inputs: diff --git a/eng/common/templates/steps/source-build.yml b/eng/common/templates/steps/source-build.yml index 41bbb915736..1d79797363d 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 eb188cfda41..0da65b5748a 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -158,18 +158,13 @@ function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) { $env:DOTNET_MULTILEVEL_LOOKUP=0 # Disable first run since we do not need all ASP.NET packages restored. - $env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 + $env:DOTNET_NOLOGO=1 # Disable telemetry on CI. if ($ci) { $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' @@ -228,7 +223,7 @@ function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) { Write-PipelinePrependPath -Path $dotnetRoot Write-PipelineSetVariable -Name 'DOTNET_MULTILEVEL_LOOKUP' -Value '0' - Write-PipelineSetVariable -Name 'DOTNET_SKIP_FIRST_TIME_EXPERIENCE' -Value '1' + Write-PipelineSetVariable -Name 'DOTNET_NOLOGO' -Value '1' return $global:_DotNetInstallDir = $dotnetRoot } @@ -604,11 +599,11 @@ function InitializeBuildTool() { # Use override if it exists - commonly set by source-build if ($null -eq $env:_OverrideArcadeInitializeBuildToolFramework) { - $initializeBuildToolFramework="net8.0" + $initializeBuildToolFramework="net9.0" } else { $initializeBuildToolFramework=$env:_OverrideArcadeInitializeBuildToolFramework } - + $buildTool = @{ Path = $dotnetPath; Command = 'msbuild'; Tool = 'dotnet'; Framework = $initializeBuildToolFramework } } elseif ($msbuildEngine -eq "vs") { try { @@ -684,8 +679,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 @@ -696,7 +697,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 } } @@ -719,7 +720,7 @@ function InitializeToolset() { throw "Invalid toolset path: $path" } - return $global:_ToolsetBuildProj = $path + return $global:_InitializeToolset = $path } function ExitWithExitCode([int] $exitCode) { @@ -771,12 +772,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) { @@ -835,7 +834,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/eng/common/tools.sh b/eng/common/tools.sh index 3392e3a9992..ece4b730795 100644 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -112,7 +112,7 @@ function InitializeDotNetCli { export DOTNET_MULTILEVEL_LOOKUP=0 # Disable first run since we want to control all package sources - export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 + export DOTNET_NOLOGO=1 # Disable telemetry on CI if [[ $ci == true ]]; then @@ -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` @@ -165,7 +160,7 @@ function InitializeDotNetCli { Write-PipelinePrependPath -path "$dotnet_root" Write-PipelineSetVariable -name "DOTNET_MULTILEVEL_LOOKUP" -value "0" - Write-PipelineSetVariable -name "DOTNET_SKIP_FIRST_TIME_EXPERIENCE" -value "1" + Write-PipelineSetVariable -name "DOTNET_NOLOGO" -value "1" # return value _InitializeDotNetCli="$dotnet_root" @@ -310,7 +305,7 @@ function GetDotNetInstallScript { curl "$install_script_url" -sSL --retry 10 --create-dirs -o "$install_script" || { if command -v openssl &> /dev/null; then echo "Curl failed; dumping some information about dotnet.microsoft.com for later investigation" - echo | openssl s_client -showcerts -servername dotnet.microsoft.com -connect dotnet.microsoft.com:443 + echo | openssl s_client -showcerts -servername dotnet.microsoft.com -connect dotnet.microsoft.com:443 || true fi echo "Will now retry the same URL with verbose logging." with_retries curl "$install_script_url" -sSL --verbose --retry 10 --create-dirs -o "$install_script" || { @@ -343,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 @@ -458,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 910c5f4b7e4..8239d71806c 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "8.0.101", + "dotnet": "9.0.100-alpha.1.23615.4", "runtimes": { "aspnetcore": [ "$(MicrosoftAspNetCoreApp60Version)", @@ -26,7 +26,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24060.4", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24060.4" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24065.5", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24065.5" } } From f59e3b048ae4fd90f23b387d16dafb151579d58d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 16 Jan 2024 13:00:40 -0800 Subject: [PATCH 005/568] [feature/9.x] Update dependencies from dotnet/roslyn-analyzers (#5825) * Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20240111.1 Microsoft.CodeAnalysis.NetAnalyzers From Version 8.0.0-preview.23525.2 -> To Version 9.0.0-preview.24061.1 * Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20240111.1 Microsoft.CodeAnalysis.NetAnalyzers From Version 8.0.0-preview.23525.2 -> To Version 9.0.0-preview.24061.1 * Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20240111.1 Microsoft.CodeAnalysis.NetAnalyzers From Version 8.0.0-preview.23525.2 -> To Version 9.0.0-preview.24061.1 * Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20240111.1 Microsoft.CodeAnalysis.NetAnalyzers From Version 8.0.0-preview.23525.2 -> To Version 9.0.0-preview.24061.1 * Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20240115.3 Microsoft.CodeAnalysis.NetAnalyzers From Version 8.0.0-preview.23525.2 -> To Version 9.0.0-preview.24065.3 --------- Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7c2042607f6..1fc13f5239f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -18,9 +18,9 @@ - + https://github.com/dotnet/roslyn-analyzers - b4d9a1334d5189172977ba8fddd00bda70161e4a + ae3bd81d1689b150d7ef72dd0737e2d5d606e5b2 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index c7d675a6f0d..6074f0a7587 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -67,7 +67,7 @@ 8.0.102-servicing.24061.7 - 8.0.0-preview.23525.2 + 9.0.0-preview.24065.3 8.0.1 8.0.1-servicing.23580.1 From a099b185c83f4f06263fc133ecee4edef60280b8 Mon Sep 17 00:00:00 2001 From: Wiktor Kopec Date: Thu, 18 Jan 2024 10:46:13 -0800 Subject: [PATCH 006/568] Rename packages to framework 9 (#5850) --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1fc13f5239f..ce27239c194 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,11 +54,11 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime bf5e279d9239bfef5bb1b8d6212f1b971c434606 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 8e941eb42f819adb116b881195158b3887a70a1c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime bf5e279d9239bfef5bb1b8d6212f1b971c434606 From 90e58b720696a691e7f58a282bb78acad22fdcf0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 18 Jan 2024 11:29:05 -0800 Subject: [PATCH 007/568] [feature/9.x] Update dependencies from dotnet/installer (#5851) * Update dependencies from https://github.com/dotnet/installer build 20240118.3 Microsoft.Dotnet.Sdk.Internal From Version 8.0.102-servicing.24061.7 -> To Version 9.0.100-alpha.1.24068.3 Dependency coherency updates Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0 From Version 8.0.1 -> To Version 9.0.0-alpha.1.24061.8 (parent: Microsoft.Dotnet.Sdk.Internal * Fixup other properties --------- Co-authored-by: dotnet-maestro[bot] Co-authored-by: Wiktor Kopec --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 10 +++++----- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ce27239c194..46daa075d4f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - - https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8e941eb42f819adb116b881195158b3887a70a1c + + https://github.com/dotnet/aspnetcore + a19c70eba3f89c7cbe9447f029b4c63322f47846 https://github.com/dotnet/diagnostics @@ -38,9 +38,9 @@ https://github.com/dotnet/arcade 0d95a90310e5e2afbef31f4ca1c4b692698cd686 - + https://github.com/dotnet/installer - 79cfea2c03ab0bf14dccc668aa3c41a5fef5119f + ccf1c58d7738c6b0c1d930b56555e9b00403a03e https://github.com/dotnet/arcade @@ -50,17 +50,17 @@ https://github.com/dotnet/symstore 39e2ea2473d44b2dc272543277adbce89f79e064 - - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bf5e279d9239bfef5bb1b8d6212f1b971c434606 + + https://github.com/dotnet/runtime + 22ba7d607bb1d9caa0db9afcdc47eb5cef641fcb - - https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8e941eb42f819adb116b881195158b3887a70a1c + + https://github.com/dotnet/aspnetcore + a19c70eba3f89c7cbe9447f029b4c63322f47846 - - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bf5e279d9239bfef5bb1b8d6212f1b971c434606 + + https://github.com/dotnet/runtime + 22ba7d607bb1d9caa0db9afcdc47eb5cef641fcb diff --git a/eng/Versions.props b/eng/Versions.props index 6074f0a7587..810c1951434 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,20 +57,20 @@ 9.0.0-beta.24065.5 9.0.0-beta.24065.5 - 8.0.1 - 8.0.1-servicing.23580.8 + 9.0.0-alpha.1.24061.8 + 9.0.0-alpha.1.24061.8 2.0.0-beta4.24059.2 8.0.0-preview.24065.1 8.0.0-preview.24065.1 - 8.0.102-servicing.24061.7 + 9.0.100-alpha.1.24068.3 9.0.0-preview.24065.3 - 8.0.1 - 8.0.1-servicing.23580.1 + 9.0.0-alpha.1.24061.26 + 9.0.0-alpha.1.24061.26 1.0.506501 From 7c96a1e55945dadba19c4ebdf7fcc32ff5cdb4a7 Mon Sep 17 00:00:00 2001 From: Wiktor Kopec Date: Fri, 19 Jan 2024 09:17:45 -0800 Subject: [PATCH 008/568] Change to version 9.0 (#5845) * Switch to 9.0 * Update coherent versions/PR feedback * More test fixes * Fixup dependency versions * Fix testhost generation * Fix tfms * Fix schema --- NuGet.config | 2 ++ documentation/schema.json | 7 +++++++ eng/Common.props | 2 +- eng/Versions.props | 14 ++++++++++++-- eng/dependabot/net8.0/Packages.props | 2 +- eng/pipelines/jobs/test-binaries.yml | 2 ++ src/Directory.Build.props | 4 ++-- src/Directory.Build.targets | 8 ++++++++ .../SchemaGenerationTests.cs | 2 +- .../OpenApiGeneratorTests.cs | 2 +- .../GenerateDotNetHost.targets | 4 ++++ .../TargetFrameworkMoniker.cs | 9 +++++++-- .../TargetFrameworkMonikerExtensions.cs | 4 ++++ .../TestDotNetHost.cs | 2 ++ .../TestDotNetHost.cs.template | 2 ++ .../InfoTests.cs | 2 +- ...gnostics.Monitoring.Tool.FunctionalTests.csproj | 2 +- .../Runners/MonitorRunner.cs | 4 ++-- .../ActionTestsHelper.cs | 9 ++++++--- .../CollectionRulePipelineTests.cs | 3 ++- 20 files changed, 68 insertions(+), 18 deletions(-) diff --git a/NuGet.config b/NuGet.config index 208db0ebcae..c59695f632b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -18,7 +18,9 @@ + + diff --git a/documentation/schema.json b/documentation/schema.json index f3f82545c5f..f618436f286 100644 --- a/documentation/schema.json +++ b/documentation/schema.json @@ -2693,6 +2693,13 @@ "Indented": { "type": "boolean" }, + "IndentCharacter": { + "type": "string" + }, + "IndentSize": { + "type": "integer", + "format": "int32" + }, "MaxDepth": { "type": "integer", "format": "int32" diff --git a/eng/Common.props b/eng/Common.props index d85313e7e17..d52995badc9 100644 --- a/eng/Common.props +++ b/eng/Common.props @@ -1,7 +1,7 @@ - net8.0 + net9.0 $(LatestTargetFramework) $(ArtifactsDir)bundles\$(Configuration)\NonShipping\ diff --git a/eng/Versions.props b/eng/Versions.props index 810c1951434..9675dfbc110 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -32,9 +32,9 @@ $(LatestTargetFramework) - net6.0;net7.0;$(LatestTargetFramework) + net6.0;net7.0;net8.0;$(LatestTargetFramework) - net8.0 + net9.0 false @@ -77,10 +77,12 @@ $(MicrosoftNETCoreApp31Version) 5.0.17 + $(MicrosoftNETCoreAppRuntimewinx64Version) $(MicrosoftNETCoreApp50Version) $(MicrosoftNETCoreApp60Version) $(MicrosoftNETCoreApp70Version) $(MicrosoftNETCoreApp80Version) + $(MicrosoftAspNetCoreAppRuntimewinx64Version) diff --git a/eng/pipelines/jobs/test-binaries.yml b/eng/pipelines/jobs/test-binaries.yml index cfdb3327ef4..02f42a6c067 100644 --- a/eng/pipelines/jobs/test-binaries.yml +++ b/eng/pipelines/jobs/test-binaries.yml @@ -19,6 +19,8 @@ parameters: value: .NET 7 - key: net8.0 value: .NET 8 + - key: net9.0 + value: .NET 9 useHelix: false jobs: diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 69e366ef90e..d283687da5a 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -32,8 +32,8 @@ - - TargetFrameworkMoniker=Net80 + + TargetFrameworkMoniker=Net90 $(TestRunnerAdditionalArguments) --filter "$(TestRunnerFilterArguments)" diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets index f39f0bee70e..edc992f0ec6 100644 --- a/src/Directory.Build.targets +++ b/src/Directory.Build.targets @@ -111,6 +111,14 @@ $(MicrosoftAspNetCoreApp80Version) + + <_TestRuntimeFramework Include="@(RuntimeFramework)" Condition=" '%(Identity)' == 'Microsoft.NETCore.App' "> + $(MicrosoftNETCoreApp90Version) + + <_TestRuntimeFramework Include="@(RuntimeFramework)" Condition=" '%(Identity)' == 'Microsoft.AspNetCore.App' "> + $(MicrosoftAspNetCoreApp90Version) + + <_TestRuntimeFramework Include="@(RuntimeFramework)" Condition=" '%(Identity)' != 'Microsoft.NETCore.App' and '%(Identity)' != 'Microsoft.AspNetCore.App' " /> diff --git a/src/Tests/Microsoft.Diagnostics.Monitoring.ConfigurationSchema.UnitTests/SchemaGenerationTests.cs b/src/Tests/Microsoft.Diagnostics.Monitoring.ConfigurationSchema.UnitTests/SchemaGenerationTests.cs index fe7d71fd8dd..bc1a16edd6b 100644 --- a/src/Tests/Microsoft.Diagnostics.Monitoring.ConfigurationSchema.UnitTests/SchemaGenerationTests.cs +++ b/src/Tests/Microsoft.Diagnostics.Monitoring.ConfigurationSchema.UnitTests/SchemaGenerationTests.cs @@ -35,7 +35,7 @@ public class SchemaGenerationTests AssemblyHelper.GetAssemblyArtifactBinPath( Assembly.GetExecutingAssembly(), SchemaGeneratorName, - TargetFrameworkMoniker.Net80); + TargetFrameworkMoniker.Net90); public SchemaGenerationTests(ITestOutputHelper outputHelper) { diff --git a/src/Tests/Microsoft.Diagnostics.Monitoring.OpenApiGen.UnitTests/OpenApiGeneratorTests.cs b/src/Tests/Microsoft.Diagnostics.Monitoring.OpenApiGen.UnitTests/OpenApiGeneratorTests.cs index 9f66c2602d2..217c5226e49 100644 --- a/src/Tests/Microsoft.Diagnostics.Monitoring.OpenApiGen.UnitTests/OpenApiGeneratorTests.cs +++ b/src/Tests/Microsoft.Diagnostics.Monitoring.OpenApiGen.UnitTests/OpenApiGeneratorTests.cs @@ -33,7 +33,7 @@ public class OpenApiGeneratorTests Path.Combine(Path.GetDirectoryName(CurrentExecutingAssemblyPath), OpenApiBaselineName); private static readonly string OpenApiGenPath = - AssemblyHelper.GetAssemblyArtifactBinPath(Assembly.GetExecutingAssembly(), OpenApiGenName, TargetFrameworkMoniker.Net80); + AssemblyHelper.GetAssemblyArtifactBinPath(Assembly.GetExecutingAssembly(), OpenApiGenName, TargetFrameworkMoniker.Net90); private readonly ITestOutputHelper _outputHelper; diff --git a/src/Tests/Microsoft.Diagnostics.Monitoring.TestCommon/GenerateDotNetHost.targets b/src/Tests/Microsoft.Diagnostics.Monitoring.TestCommon/GenerateDotNetHost.targets index bc9c0abebde..2c81c7df8ed 100644 --- a/src/Tests/Microsoft.Diagnostics.Monitoring.TestCommon/GenerateDotNetHost.targets +++ b/src/Tests/Microsoft.Diagnostics.Monitoring.TestCommon/GenerateDotNetHost.targets @@ -13,11 +13,13 @@ $(MicrosoftNETCoreApp60Version) $(MicrosoftNETCoreApp70Version) $(MicrosoftNETCoreApp80Version) + $(MicrosoftNETCoreApp90Version) $(MicrosoftAspNetCoreApp31Version) $(MicrosoftAspNetCoreApp50Version) $(MicrosoftAspNetCoreApp60Version) $(MicrosoftAspNetCoreApp70Version) $(MicrosoftAspNetCoreApp80Version) + $(MicrosoftAspNetCoreApp90Version) @@ -30,11 +32,13 @@ $(TransformedContent.Replace('$MicrosoftNetCoreApp60Version$', '$(MicrosoftNETCoreApp60Version)')) $(TransformedContent.Replace('$MicrosoftNetCoreApp70Version$', '$(MicrosoftNETCoreApp70Version)')) $(TransformedContent.Replace('$MicrosoftNetCoreApp80Version$', '$(MicrosoftNETCoreApp80Version)')) + $(TransformedContent.Replace('$MicrosoftNetCoreApp90Version$', '$(MicrosoftNETCoreApp90Version)')) $(TransformedContent.Replace('$MicrosoftAspNetCoreApp31Version$', '$(MicrosoftAspNetCoreApp31Version)')) $(TransformedContent.Replace('$MicrosoftAspNetCoreApp50Version$', '$(MicrosoftAspNetCoreApp50Version)')) $(TransformedContent.Replace('$MicrosoftAspNetCoreApp60Version$', '$(MicrosoftAspNetCoreApp60Version)')) $(TransformedContent.Replace('$MicrosoftAspNetCoreApp70Version$', '$(MicrosoftAspNetCoreApp70Version)')) $(TransformedContent.Replace('$MicrosoftAspNetCoreApp80Version$', '$(MicrosoftAspNetCoreApp80Version)')) + $(TransformedContent.Replace('$MicrosoftAspNetCoreApp90Version$', '$(MicrosoftAspNetCoreApp90Version)')) diff --git a/src/Tests/Microsoft.Diagnostics.Monitoring.TestCommon/TargetFrameworkMoniker.cs b/src/Tests/Microsoft.Diagnostics.Monitoring.TestCommon/TargetFrameworkMoniker.cs index 7aa2be95b5c..d6727ced5a4 100644 --- a/src/Tests/Microsoft.Diagnostics.Monitoring.TestCommon/TargetFrameworkMoniker.cs +++ b/src/Tests/Microsoft.Diagnostics.Monitoring.TestCommon/TargetFrameworkMoniker.cs @@ -12,7 +12,8 @@ public enum TargetFrameworkMoniker Net50, Net60, Net70, - Net80 + Net80, + Net90 } public static partial class TargetFrameworkMonikerExtensions @@ -31,6 +32,8 @@ public static string ToFolderName(this TargetFrameworkMoniker moniker) return "net7.0"; case TargetFrameworkMoniker.Net80: return "net8.0"; + case TargetFrameworkMoniker.Net90: + return "net9.0"; } throw CreateUnsupportedException(moniker); } @@ -41,7 +44,9 @@ private static ArgumentException CreateUnsupportedException(TargetFrameworkMonik } public const TargetFrameworkMoniker CurrentTargetFrameworkMoniker = -#if NET8_0 +#if NET9_0 + TargetFrameworkMoniker.Net90; +#elif NET8_0 TargetFrameworkMoniker.Net80; #elif NET7_0 TargetFrameworkMoniker.Net70; diff --git a/src/Tests/Microsoft.Diagnostics.Monitoring.TestCommon/TargetFrameworkMonikerExtensions.cs b/src/Tests/Microsoft.Diagnostics.Monitoring.TestCommon/TargetFrameworkMonikerExtensions.cs index 52da4f4c697..abe6cbf7b41 100644 --- a/src/Tests/Microsoft.Diagnostics.Monitoring.TestCommon/TargetFrameworkMonikerExtensions.cs +++ b/src/Tests/Microsoft.Diagnostics.Monitoring.TestCommon/TargetFrameworkMonikerExtensions.cs @@ -29,6 +29,8 @@ public static string GetAspNetCoreFrameworkVersionString(this TargetFrameworkMon return TestDotNetHost.AspNetCore70VersionString; case TargetFrameworkMoniker.Net80: return TestDotNetHost.AspNetCore80VersionString; + case TargetFrameworkMoniker.Net90: + return TestDotNetHost.AspNetCore90VersionString; } throw CreateUnsupportedException(moniker); } @@ -49,6 +51,8 @@ public static string GetNetCoreAppFrameworkVersionString(this TargetFrameworkMon return TestDotNetHost.NetCore70VersionString; case TargetFrameworkMoniker.Net80: return TestDotNetHost.NetCore80VersionString; + case TargetFrameworkMoniker.Net90: + return TestDotNetHost.NetCore90VersionString; } throw CreateUnsupportedException(moniker); } diff --git a/src/Tests/Microsoft.Diagnostics.Monitoring.TestCommon/TestDotNetHost.cs b/src/Tests/Microsoft.Diagnostics.Monitoring.TestCommon/TestDotNetHost.cs index e517cb5db1c..2d8fe68c07b 100644 --- a/src/Tests/Microsoft.Diagnostics.Monitoring.TestCommon/TestDotNetHost.cs +++ b/src/Tests/Microsoft.Diagnostics.Monitoring.TestCommon/TestDotNetHost.cs @@ -88,6 +88,8 @@ public static TargetFrameworkMoniker BuiltTargetFrameworkMoniker return TargetFrameworkMoniker.Net70; #elif NET8_0 return TargetFrameworkMoniker.Net80; +#elif NET9_0 + return TargetFrameworkMoniker.Net90; #endif } } diff --git a/src/Tests/Microsoft.Diagnostics.Monitoring.TestCommon/TestDotNetHost.cs.template b/src/Tests/Microsoft.Diagnostics.Monitoring.TestCommon/TestDotNetHost.cs.template index db503d241c1..cbc15afac94 100644 --- a/src/Tests/Microsoft.Diagnostics.Monitoring.TestCommon/TestDotNetHost.cs.template +++ b/src/Tests/Microsoft.Diagnostics.Monitoring.TestCommon/TestDotNetHost.cs.template @@ -15,11 +15,13 @@ namespace Microsoft.Diagnostics.Monitoring.TestCommon public static readonly string NetCore60VersionString = "$MicrosoftNetCoreApp60Version$"; public static readonly string NetCore70VersionString = "$MicrosoftNetCoreApp70Version$"; public static readonly string NetCore80VersionString = "$MicrosoftNetCoreApp80Version$"; + public static readonly string NetCore90VersionString = "$MicrosoftNetCoreApp90Version$"; public static readonly string AspNetCore31VersionString = "$MicrosoftAspNetCoreApp31Version$"; public static readonly string AspNetCore50VersionString = "$MicrosoftAspNetCoreApp50Version$"; public static readonly string AspNetCore60VersionString = "$MicrosoftAspNetCoreApp60Version$"; public static readonly string AspNetCore70VersionString = "$MicrosoftAspNetCoreApp70Version$"; public static readonly string AspNetCore80VersionString = "$MicrosoftAspNetCoreApp80Version$"; + public static readonly string AspNetCore90VersionString = "$MicrosoftAspNetCoreApp90Version$"; } } diff --git a/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests/InfoTests.cs b/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests/InfoTests.cs index 7b78b648e4d..c4812fd78c6 100644 --- a/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests/InfoTests.cs +++ b/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests/InfoTests.cs @@ -51,7 +51,7 @@ public Task InfoEndpointValidationTest(DiagnosticPortConnectionMode mode) Assert.NotNull(info.Version); // Not sure of how to get Dotnet Monitor version from within tests... Assert.True(Version.TryParse(info.RuntimeVersion, out Version runtimeVersion), "Unable to parse version from RuntimeVersion property."); - Version currentAspNetVersion = TargetFrameworkMoniker.Net80.GetAspNetCoreFrameworkVersion(); + Version currentAspNetVersion = TargetFrameworkMoniker.Net90.GetAspNetCoreFrameworkVersion(); Assert.Equal(currentAspNetVersion.Major, runtimeVersion.Major); Assert.Equal(currentAspNetVersion.Minor, runtimeVersion.Minor); Assert.Equal(currentAspNetVersion.Revision, runtimeVersion.Revision); diff --git a/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests/Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests.csproj b/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests/Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests.csproj index 3b632639638..e794b2c35a8 100644 --- a/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests/Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests.csproj +++ b/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests/Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests.csproj @@ -92,7 +92,7 @@ false true - TargetFramework=net8.0 + TargetFramework=net9.0 diff --git a/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests/Runners/MonitorRunner.cs b/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests/Runners/MonitorRunner.cs index f7068a34d46..db2b1190891 100644 --- a/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests/Runners/MonitorRunner.cs +++ b/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests/Runners/MonitorRunner.cs @@ -68,14 +68,14 @@ internal class MonitorRunner : IAsyncDisposable AssemblyHelper.GetAssemblyArtifactBinPath( Assembly.GetExecutingAssembly(), "dotnet-monitor", - TargetFrameworkMoniker.Net80 + TargetFrameworkMoniker.Net90 ); private static string TestStartupHookPath => AssemblyHelper.GetAssemblyArtifactBinPath( Assembly.GetExecutingAssembly(), TestStartupHookAssemblyName, - TargetFrameworkMoniker.Net80 + TargetFrameworkMoniker.Net90 ); private string SharedConfigDirectoryPath => diff --git a/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.UnitTestCommon/ActionTestsHelper.cs b/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.UnitTestCommon/ActionTestsHelper.cs index 35efb18c519..82b2a63f5ee 100644 --- a/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.UnitTestCommon/ActionTestsHelper.cs +++ b/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.UnitTestCommon/ActionTestsHelper.cs @@ -24,13 +24,15 @@ internal static class ActionTestsHelper { TargetFrameworkMoniker.Net60, TargetFrameworkMoniker.Net70, - TargetFrameworkMoniker.Net80 + TargetFrameworkMoniker.Net80, + TargetFrameworkMoniker.Net90 }; public static TargetFrameworkMoniker[] tfms6PlusToTest = new TargetFrameworkMoniker[] { TargetFrameworkMoniker.Net60, TargetFrameworkMoniker.Net70, - TargetFrameworkMoniker.Net80 + TargetFrameworkMoniker.Net80, + TargetFrameworkMoniker.Net90 }; public static IEnumerable GetTfms() @@ -71,7 +73,8 @@ public static IEnumerable GetTfmsAndDumpTypes() if (!DistroInformation.IsAlpineLinux || tfm == TargetFrameworkMoniker.Net60 || tfm == TargetFrameworkMoniker.Net70 - || tfm == TargetFrameworkMoniker.Net80) + || tfm == TargetFrameworkMoniker.Net80 + || tfm == TargetFrameworkMoniker.Net90) { yield return new object[] { tfm, DumpType.WithHeap }; yield return new object[] { tfm, DumpType.Triage }; diff --git a/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.UnitTests/CollectionRulePipelineTests.cs b/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.UnitTests/CollectionRulePipelineTests.cs index 758c76ac63f..88d4fee2c73 100644 --- a/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.UnitTests/CollectionRulePipelineTests.cs +++ b/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.UnitTests/CollectionRulePipelineTests.cs @@ -577,11 +577,12 @@ public static IEnumerable GetTfmsSupportingPortListener() yield return new object[] { TargetFrameworkMoniker.Net60 }; yield return new object[] { TargetFrameworkMoniker.Net70 }; yield return new object[] { TargetFrameworkMoniker.Net80 }; + yield return new object[] { TargetFrameworkMoniker.Net90 }; } public static IEnumerable GetCurrentTfm() { - yield return new object[] { TargetFrameworkMoniker.Net80 }; + yield return new object[] { TargetFrameworkMoniker.Net90 }; } } } From ef65f6a3f97f636771563461b99b240b9e3ea537 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 19 Jan 2024 12:14:01 -0800 Subject: [PATCH 009/568] Replace tagBuildOrRelease with Powershell inline script (#5838) (#5864) Co-authored-by: Justin Anderson --- eng/pipelines/stages/preparerelease.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/pipelines/stages/preparerelease.yml b/eng/pipelines/stages/preparerelease.yml index 0c17c223113..9bb6dffd023 100644 --- a/eng/pipelines/stages/preparerelease.yml +++ b/eng/pipelines/stages/preparerelease.yml @@ -85,20 +85,20 @@ stages: artifact: 'StagingToolAssetsLayout' # Only tag build from real release branches - ${{ if not(startsWith(variables['Build.SourceBranch'], 'refs/heads/test/release/')) }}: - - task: tagBuildOrRelease@0 + - task: Powershell@2 displayName: 'Tag Build with MonitorRelease' inputs: - type: 'Build' - tags: 'MonitorRelease' + targetType: inline + script: Write-Host "##vso[build.addbuildtag]MonitorRelease" - task: PublishPipelineArtifact@1 displayName: 'Upload Staging Tool Logs' inputs: targetPath: '$(System.ArtifactsDirectory)\StagingToolLogs' artifact: 'StagingToolLogs' - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - task: tagBuildOrRelease@0 + - task: Powershell@2 displayName: 'Tag Build with update-docker' condition: ${{ parameters.updateDockerCondition }} inputs: - type: 'Build' - tags: 'update-docker' + targetType: inline + script: Write-Host "##vso[build.addbuildtag]update-docker" From 5300ff4ecc5341d8b02b7cba887c9c08e10fbd97 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 19 Jan 2024 12:14:30 -0800 Subject: [PATCH 010/568] Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20240117.1 (#5863) Microsoft.CodeAnalysis.NetAnalyzers From Version 9.0.0-preview.24065.3 -> To Version 9.0.0-preview.24067.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 46daa075d4f..297710f33fd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -18,9 +18,9 @@ - + https://github.com/dotnet/roslyn-analyzers - ae3bd81d1689b150d7ef72dd0737e2d5d606e5b2 + 23ec029b47d68b1a80348c0dabc3bccf013c1fe6 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 9675dfbc110..48187998621 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -67,7 +67,7 @@ 9.0.100-alpha.1.24068.3 - 9.0.0-preview.24065.3 + 9.0.0-preview.24067.1 9.0.0-alpha.1.24061.26 9.0.0-alpha.1.24061.26 @@ -112,7 +112,7 @@ $(MicrosoftExtensionsLogging80Version) $(MicrosoftExtensionsLoggingAbstractions80Version) $(MicrosoftExtensionsLoggingConsole80Version) - + $(MicrosoftAspNetCoreApp90Version) $(MicrosoftAspNetCoreApp90Version) From 30c5d19e02cb5a2911da7c619e5b0e4a29a70ef4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 19 Jan 2024 12:14:41 -0800 Subject: [PATCH 011/568] Update dependencies from https://github.com/dotnet/installer build 20240119.2 (#5862) Microsoft.Dotnet.Sdk.Internal From Version 9.0.100-alpha.1.24068.3 -> To Version 9.0.100-alpha.1.24069.2 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 297710f33fd..09dcc32e4f0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -38,9 +38,9 @@ https://github.com/dotnet/arcade 0d95a90310e5e2afbef31f4ca1c4b692698cd686 - + https://github.com/dotnet/installer - ccf1c58d7738c6b0c1d930b56555e9b00403a03e + 773cdec13b58ddd046bdcf800b28f8d16a5d8859 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 48187998621..a79f340854d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,7 +65,7 @@ 8.0.0-preview.24065.1 8.0.0-preview.24065.1 - 9.0.100-alpha.1.24068.3 + 9.0.100-alpha.1.24069.2 9.0.0-preview.24067.1 From 458115a479443f8e1da0d44c6c2f1dee4f10e45b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 19 Jan 2024 12:14:51 -0800 Subject: [PATCH 012/568] Update dependencies from https://github.com/dotnet/diagnostics build 20240118.1 (#5860) Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe From Version 8.0.0-preview.24065.1 -> To Version 8.0.0-preview.24068.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 09dcc32e4f0..6bfad81109f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore a19c70eba3f89c7cbe9447f029b4c63322f47846 - + https://github.com/dotnet/diagnostics - 70f954cd70ed1701e9dc55578fde1b3c48b1d32b + b0ee5b9a01e571161bf772aa659440a986bbe532 - + https://github.com/dotnet/diagnostics - 70f954cd70ed1701e9dc55578fde1b3c48b1d32b + b0ee5b9a01e571161bf772aa659440a986bbe532 https://github.com/dotnet/command-line-api diff --git a/eng/Versions.props b/eng/Versions.props index a79f340854d..6767baa0f10 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -62,8 +62,8 @@ 2.0.0-beta4.24059.2 - 8.0.0-preview.24065.1 - 8.0.0-preview.24065.1 + 8.0.0-preview.24068.1 + 8.0.0-preview.24068.1 9.0.100-alpha.1.24069.2 From ece9cafe6c322f7a1ae5f5f99d8e398cc7687369 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 22 Jan 2024 17:04:40 -0800 Subject: [PATCH 013/568] [feature/9.x] Update dependencies from dotnet/installer (#5867) * Update dependencies from https://github.com/dotnet/installer build 20240120.2 Microsoft.Dotnet.Sdk.Internal From Version 9.0.100-alpha.1.24069.2 -> To Version 9.0.100-alpha.1.24070.2 Dependency coherency updates Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0 From Version 9.0.0-alpha.1.24061.8 -> To Version 9.0.0-alpha.1.24068.16 (parent: Microsoft.Dotnet.Sdk.Internal * Update dependencies from https://github.com/dotnet/installer build 20240120.3 Microsoft.Dotnet.Sdk.Internal From Version 9.0.100-alpha.1.24069.2 -> To Version 9.0.100-alpha.1.24070.3 Dependency coherency updates Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0 From Version 9.0.0-alpha.1.24061.8 -> To Version 9.0.0-alpha.1.24068.16 (parent: Microsoft.Dotnet.Sdk.Internal * Update dependencies from https://github.com/dotnet/installer build 20240120.3 Microsoft.Dotnet.Sdk.Internal From Version 9.0.100-alpha.1.24069.2 -> To Version 9.0.100-alpha.1.24070.3 Dependency coherency updates Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0 From Version 9.0.0-alpha.1.24061.8 -> To Version 9.0.0-alpha.1.24068.16 (parent: Microsoft.Dotnet.Sdk.Internal --------- Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6bfad81109f..428e02e998e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/aspnetcore - a19c70eba3f89c7cbe9447f029b4c63322f47846 + b89e21ed72c7afd58fd372f7b8e6299847a8153a https://github.com/dotnet/diagnostics @@ -38,9 +38,9 @@ https://github.com/dotnet/arcade 0d95a90310e5e2afbef31f4ca1c4b692698cd686 - + https://github.com/dotnet/installer - 773cdec13b58ddd046bdcf800b28f8d16a5d8859 + f91d4ca399ea4389d04b4700965d207f3a8d5c3b https://github.com/dotnet/arcade @@ -50,17 +50,17 @@ https://github.com/dotnet/symstore 39e2ea2473d44b2dc272543277adbce89f79e064 - + https://github.com/dotnet/runtime - 22ba7d607bb1d9caa0db9afcdc47eb5cef641fcb + dbb335c6ba14b38400b2d8c3a5876698021ec089 - + https://github.com/dotnet/aspnetcore - a19c70eba3f89c7cbe9447f029b4c63322f47846 + b89e21ed72c7afd58fd372f7b8e6299847a8153a - + https://github.com/dotnet/runtime - 22ba7d607bb1d9caa0db9afcdc47eb5cef641fcb + dbb335c6ba14b38400b2d8c3a5876698021ec089 diff --git a/eng/Versions.props b/eng/Versions.props index 6767baa0f10..a44953265b5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,20 +57,20 @@ 9.0.0-beta.24065.5 9.0.0-beta.24065.5 - 9.0.0-alpha.1.24061.8 - 9.0.0-alpha.1.24061.8 + 9.0.0-alpha.1.24068.16 + 9.0.0-alpha.1.24068.16 2.0.0-beta4.24059.2 8.0.0-preview.24068.1 8.0.0-preview.24068.1 - 9.0.100-alpha.1.24069.2 + 9.0.100-alpha.1.24070.3 9.0.0-preview.24067.1 - 9.0.0-alpha.1.24061.26 - 9.0.0-alpha.1.24061.26 + 9.0.0-alpha.1.24066.33 + 9.0.0-alpha.1.24066.33 1.0.506501 From f78784424d3f75d3e2104805111a5a9cf01e101a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 22 Jan 2024 17:40:19 -0800 Subject: [PATCH 014/568] Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20240122.1 (#5870) Microsoft.CodeAnalysis.NetAnalyzers From Version 9.0.0-preview.24067.1 -> To Version 9.0.0-preview.24072.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 428e02e998e..78ec77b8546 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -18,9 +18,9 @@ - + https://github.com/dotnet/roslyn-analyzers - 23ec029b47d68b1a80348c0dabc3bccf013c1fe6 + e39798fc8357615ab319c81b20acfb036ef7b513 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index a44953265b5..f947c55ee31 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -67,7 +67,7 @@ 9.0.100-alpha.1.24070.3 - 9.0.0-preview.24067.1 + 9.0.0-preview.24072.1 9.0.0-alpha.1.24066.33 9.0.0-alpha.1.24066.33 From 00cd20ba8c5fa6c9ebd8fec17bf53ec1373ac2a0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 22 Jan 2024 19:01:59 -0800 Subject: [PATCH 015/568] [feature/9.x] Update dependencies from dotnet/command-line-api (#5859) * Update dependencies from https://github.com/dotnet/command-line-api build 20240118.1 System.CommandLine From Version 2.0.0-beta4.24059.2 -> To Version 2.0.0-beta4.24068.1 * Update dependencies from https://github.com/dotnet/command-line-api build 20240118.1 System.CommandLine From Version 2.0.0-beta4.24059.2 -> To Version 2.0.0-beta4.24068.1 * Update dependencies from https://github.com/dotnet/command-line-api build 20240118.1 System.CommandLine From Version 2.0.0-beta4.24059.2 -> To Version 2.0.0-beta4.24068.1 * Update dependencies from https://github.com/dotnet/command-line-api build 20240118.1 System.CommandLine From Version 2.0.0-beta4.24059.2 -> To Version 2.0.0-beta4.24068.1 --------- Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 78ec77b8546..452f5eb4e15 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -12,9 +12,9 @@ https://github.com/dotnet/diagnostics b0ee5b9a01e571161bf772aa659440a986bbe532 - + https://github.com/dotnet/command-line-api - 27035e88527f555a3806ae7d63af7501b41ea5d5 + ecd2ce5eafbba3008a7d4f5d04b025d30928c812 diff --git a/eng/Versions.props b/eng/Versions.props index f947c55ee31..fdd7a90e6b5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -60,7 +60,7 @@ 9.0.0-alpha.1.24068.16 9.0.0-alpha.1.24068.16 - 2.0.0-beta4.24059.2 + 2.0.0-beta4.24068.1 8.0.0-preview.24068.1 8.0.0-preview.24068.1 From 05d488e0b6cad9a5404faf6a27a3e346126f7ad4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 22 Jan 2024 19:02:13 -0800 Subject: [PATCH 016/568] [feature/9.x] Update dependencies from dotnet/diagnostics (#5866) * Update dependencies from https://github.com/dotnet/diagnostics build 20240119.1 Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe From Version 8.0.0-preview.24068.1 -> To Version 8.0.0-preview.24069.1 * Update dependencies from https://github.com/dotnet/diagnostics build 20240119.1 Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe From Version 8.0.0-preview.24068.1 -> To Version 8.0.0-preview.24069.1 * Update dependencies from https://github.com/dotnet/diagnostics build 20240119.1 Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe From Version 8.0.0-preview.24068.1 -> To Version 8.0.0-preview.24069.1 --------- Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 452f5eb4e15..432ce54b8a7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,11 +4,11 @@ https://github.com/dotnet/aspnetcore b89e21ed72c7afd58fd372f7b8e6299847a8153a - + https://github.com/dotnet/diagnostics b0ee5b9a01e571161bf772aa659440a986bbe532 - + https://github.com/dotnet/diagnostics b0ee5b9a01e571161bf772aa659440a986bbe532 diff --git a/eng/Versions.props b/eng/Versions.props index fdd7a90e6b5..6a433060bee 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -62,8 +62,8 @@ 2.0.0-beta4.24068.1 - 8.0.0-preview.24068.1 - 8.0.0-preview.24068.1 + 8.0.0-preview.24069.1 + 8.0.0-preview.24069.1 9.0.100-alpha.1.24070.3 From 4f78000e3840c5deb667a43ba15ae84f3760ec4f Mon Sep 17 00:00:00 2001 From: Wiktor Kopec Date: Wed, 24 Jan 2024 08:55:31 -0800 Subject: [PATCH 017/568] Update sdk (#5883) --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index 8239d71806c..30ebc41f674 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "9.0.100-alpha.1.23615.4", + "dotnet": "9.0.100-alpha.1.24067.4", "runtimes": { "aspnetcore": [ "$(MicrosoftAspNetCoreApp60Version)", From b192bd5d29538bddb18cb51fabbb49bd14b5a466 Mon Sep 17 00:00:00 2001 From: Wiktor Kopec Date: Thu, 25 Jan 2024 09:27:00 -0800 Subject: [PATCH 018/568] Fix exception tests for 9.0 (#5888) --- .../ExceptionsTests.cs | 2 +- .../Scenarios/ExceptionsScenario.cs | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests/ExceptionsTests.cs b/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests/ExceptionsTests.cs index 4e4de04ecec..01185c744a4 100644 --- a/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests/ExceptionsTests.cs +++ b/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests/ExceptionsTests.cs @@ -33,7 +33,7 @@ public class ExceptionsTests private const string UnitTestAppModule = "Microsoft.Diagnostics.Monitoring.UnitTestApp.dll"; private const string CoreLibModuleName = "System.Private.CoreLib.dll"; private const string SystemInvalidOperationException = "System.InvalidOperationException"; - private const string ExceptionMessage = $"Exception of type '{SystemInvalidOperationException}' was thrown."; + private const string ExceptionMessage = $"Operation is not valid due to the current state of the object."; private const string FirstChanceExceptionMessage = "First chance exception at"; private const string CustomGenericsException = "Microsoft.Diagnostics.Monitoring.UnitTestApp.Scenarios.ExceptionsScenario+CustomGenericsException`2[System.Int32,System.String]"; private const string SystemArgumentNullException = "System.ArgumentNullException"; diff --git a/src/Tests/Microsoft.Diagnostics.Monitoring.UnitTestApp/Scenarios/ExceptionsScenario.cs b/src/Tests/Microsoft.Diagnostics.Monitoring.UnitTestApp/Scenarios/ExceptionsScenario.cs index 1b8eac7f820..ef6017f0fe8 100644 --- a/src/Tests/Microsoft.Diagnostics.Monitoring.UnitTestApp/Scenarios/ExceptionsScenario.cs +++ b/src/Tests/Microsoft.Diagnostics.Monitoring.UnitTestApp/Scenarios/ExceptionsScenario.cs @@ -407,7 +407,7 @@ private static void ThrowAndCatchInvalidOperationException(bool includeInnerExce } } - throw new InvalidOperationException(null, innerException); + throw new InvalidOperationException("Operation is not valid due to the current state of the object.", innerException); } catch (Exception) { @@ -425,7 +425,7 @@ private static void ThrowAndCatchEclipsingInvalidOperationException() } catch (Exception innerException) { - throw new InvalidOperationException(null, innerException); + throw new InvalidOperationException("Operation is not valid due to the current state of the object.", innerException); } } catch (Exception) @@ -455,7 +455,7 @@ private static void ThrowAndCatchEclipsingInvalidOperationExceptionFromMethodCal [MethodImpl(MethodImplOptions.NoInlining)] private static void ThrowInvalidOperationExceptionWithInnerException(Exception innerException) { - throw new InvalidOperationException(null, innerException); + throw new InvalidOperationException("Operation is not valid due to the current state of the object.", innerException); } [MethodImpl(MethodImplOptions.NoInlining)] From b3bc9838a234e311e5736b787d526d25ebf04a63 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 25 Jan 2024 15:27:43 -0800 Subject: [PATCH 019/568] [feature/9.x] Update dependencies from dotnet/symstore (#5876) * Update dependencies from https://github.com/dotnet/symstore build 20240122.1 Microsoft.FileFormats From Version 1.0.506501 -> To Version 1.0.507201 * Update dependencies from https://github.com/dotnet/symstore build 20240122.1 Microsoft.FileFormats From Version 1.0.506501 -> To Version 1.0.507201 * Update dependencies from https://github.com/dotnet/symstore build 20240122.1 Microsoft.FileFormats From Version 1.0.506501 -> To Version 1.0.507201 --------- Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 432ce54b8a7..6eafef062a0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -46,9 +46,9 @@ https://github.com/dotnet/arcade 0d95a90310e5e2afbef31f4ca1c4b692698cd686 - + https://github.com/dotnet/symstore - 39e2ea2473d44b2dc272543277adbce89f79e064 + 130f269d4162ead65afc7992205cd5a0fe9a22b8 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 6a433060bee..e938a120bf9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -72,7 +72,7 @@ 9.0.0-alpha.1.24066.33 9.0.0-alpha.1.24066.33 - 1.0.506501 + 1.0.507201 $(MicrosoftNETCoreApp31Version) From 2632d2dbe48e2c02b1cd4f326162dabffe825880 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 25 Jan 2024 15:45:50 -0800 Subject: [PATCH 020/568] Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20240124.1 (#5891) Microsoft.CodeAnalysis.NetAnalyzers From Version 9.0.0-preview.24072.1 -> To Version 9.0.0-preview.24074.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6eafef062a0..cd86f710f9d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -18,9 +18,9 @@ - + https://github.com/dotnet/roslyn-analyzers - e39798fc8357615ab319c81b20acfb036ef7b513 + 890806a346d4feba05b88f6ca3da201dec75e4d3 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index e938a120bf9..1b2448b5332 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -67,7 +67,7 @@ 9.0.100-alpha.1.24070.3 - 9.0.0-preview.24072.1 + 9.0.0-preview.24074.1 9.0.0-alpha.1.24066.33 9.0.0-alpha.1.24066.33 From 9c7b599fd5ba62bd1bcf2e654b6328706151e265 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 25 Jan 2024 18:55:46 -0800 Subject: [PATCH 021/568] [feature/9.x] Update dependencies from dotnet/diagnostics (#5875) * Update dependencies from https://github.com/dotnet/diagnostics build 20240122.1 Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe From Version 8.0.0-preview.24069.1 -> To Version 8.0.0-preview.24072.1 * Update dependencies from https://github.com/dotnet/diagnostics build 20240123.1 Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe From Version 8.0.0-preview.24069.1 -> To Version 8.0.0-preview.24073.1 * Update dependencies from https://github.com/dotnet/diagnostics build 20240124.1 Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe From Version 8.0.0-preview.24069.1 -> To Version 8.0.0-preview.24074.1 --------- Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cd86f710f9d..32f52e9584a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore b89e21ed72c7afd58fd372f7b8e6299847a8153a - + https://github.com/dotnet/diagnostics - b0ee5b9a01e571161bf772aa659440a986bbe532 + d0967129f11b91b02d752025a0903e250eebeaad - + https://github.com/dotnet/diagnostics - b0ee5b9a01e571161bf772aa659440a986bbe532 + d0967129f11b91b02d752025a0903e250eebeaad https://github.com/dotnet/command-line-api diff --git a/eng/Versions.props b/eng/Versions.props index 1b2448b5332..e2dda73a1b4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -62,8 +62,8 @@ 2.0.0-beta4.24068.1 - 8.0.0-preview.24069.1 - 8.0.0-preview.24069.1 + 8.0.0-preview.24074.1 + 8.0.0-preview.24074.1 9.0.100-alpha.1.24070.3 From 5701448262d1a7e5e33636c9c4b1b52508f960df Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 26 Jan 2024 09:45:45 -0800 Subject: [PATCH 022/568] Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20240125.1 (#5896) Microsoft.CodeAnalysis.NetAnalyzers From Version 9.0.0-preview.24074.1 -> To Version 9.0.0-preview.24075.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 32f52e9584a..66a1ce358ad 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -18,9 +18,9 @@ - + https://github.com/dotnet/roslyn-analyzers - 890806a346d4feba05b88f6ca3da201dec75e4d3 + bf54e2bebc28004dec0311dc4083bcff4fd44cdb https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index e2dda73a1b4..9c2581b0927 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -67,7 +67,7 @@ 9.0.100-alpha.1.24070.3 - 9.0.0-preview.24074.1 + 9.0.0-preview.24075.1 9.0.0-alpha.1.24066.33 9.0.0-alpha.1.24066.33 From 8930bcfc639645e1198265e4d643054f856acfdf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 26 Jan 2024 09:46:06 -0800 Subject: [PATCH 023/568] Update dependencies from https://github.com/dotnet/diagnostics build 20240125.1 (#5895) Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe From Version 8.0.0-preview.24074.1 -> To Version 8.0.0-preview.24075.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 66a1ce358ad..d77257a7205 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,11 +4,11 @@ https://github.com/dotnet/aspnetcore b89e21ed72c7afd58fd372f7b8e6299847a8153a - + https://github.com/dotnet/diagnostics d0967129f11b91b02d752025a0903e250eebeaad - + https://github.com/dotnet/diagnostics d0967129f11b91b02d752025a0903e250eebeaad diff --git a/eng/Versions.props b/eng/Versions.props index 9c2581b0927..772999b5d21 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -62,8 +62,8 @@ 2.0.0-beta4.24068.1 - 8.0.0-preview.24074.1 - 8.0.0-preview.24074.1 + 8.0.0-preview.24075.1 + 8.0.0-preview.24075.1 9.0.100-alpha.1.24070.3 From cc9dc2273bb044a0392eb55d61fa10ba59bb2c41 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 29 Jan 2024 12:36:39 -0800 Subject: [PATCH 024/568] [feature/9.x] Update dependencies from dotnet/installer (#5898) * Update dependencies from https://github.com/dotnet/installer build 20240126.14 Microsoft.Dotnet.Sdk.Internal From Version 9.0.100-alpha.1.24070.3 -> To Version 9.0.100-preview.1.24076.14 Dependency coherency updates Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0 From Version 9.0.0-alpha.1.24068.16 -> To Version 9.0.0-preview.1.24075.4 (parent: Microsoft.Dotnet.Sdk.Internal * Pin later sdk * Disable dump tests * Update dependencies from https://github.com/dotnet/installer build 20240126.20 Microsoft.Dotnet.Sdk.Internal From Version 9.0.100-alpha.1.24070.3 -> To Version 9.0.100-preview.1.24076.20 Dependency coherency updates Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0 From Version 9.0.0-alpha.1.24068.16 -> To Version 9.0.0-preview.1.24075.4 (parent: Microsoft.Dotnet.Sdk.Internal * Update dependencies from https://github.com/dotnet/installer build 20240126.20 Microsoft.Dotnet.Sdk.Internal From Version 9.0.100-alpha.1.24070.3 -> To Version 9.0.100-preview.1.24076.20 Dependency coherency updates Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0 From Version 9.0.0-alpha.1.24068.16 -> To Version 9.0.0-preview.1.24075.4 (parent: Microsoft.Dotnet.Sdk.Internal * Update dependencies from https://github.com/dotnet/installer build 20240128.4 Microsoft.Dotnet.Sdk.Internal From Version 9.0.100-alpha.1.24070.3 -> To Version 9.0.100-preview.1.24078.4 Dependency coherency updates Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0 From Version 9.0.0-alpha.1.24068.16 -> To Version 9.0.0-preview.1.24075.4 (parent: Microsoft.Dotnet.Sdk.Internal * Disable Azurite test for net9.0 Linux --------- Co-authored-by: dotnet-maestro[bot] Co-authored-by: Wiktor Kopec --- eng/Version.Details.xml | 20 +++++++++---------- eng/Versions.props | 10 +++++----- global.json | 2 +- .../CollectDumpActionTests.cs | 7 +++++++ .../Fixtures/AzuriteFixture.cs | 6 ++++++ .../DumpTests.cs | 2 +- 6 files changed, 30 insertions(+), 17 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d77257a7205..8b8161016fc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/aspnetcore - b89e21ed72c7afd58fd372f7b8e6299847a8153a + 1d58b24591820b2a134cfc0a5e3154bf9fe65cb4 https://github.com/dotnet/diagnostics @@ -38,9 +38,9 @@ https://github.com/dotnet/arcade 0d95a90310e5e2afbef31f4ca1c4b692698cd686 - + https://github.com/dotnet/installer - f91d4ca399ea4389d04b4700965d207f3a8d5c3b + efdeb117dd05a344009dd95ce25f265d313720ff https://github.com/dotnet/arcade @@ -50,17 +50,17 @@ https://github.com/dotnet/symstore 130f269d4162ead65afc7992205cd5a0fe9a22b8 - + https://github.com/dotnet/runtime - dbb335c6ba14b38400b2d8c3a5876698021ec089 + b4aa81d9da52616ac18e6eb584e37a08cfb2ba87 - + https://github.com/dotnet/aspnetcore - b89e21ed72c7afd58fd372f7b8e6299847a8153a + 1d58b24591820b2a134cfc0a5e3154bf9fe65cb4 - + https://github.com/dotnet/runtime - dbb335c6ba14b38400b2d8c3a5876698021ec089 + b4aa81d9da52616ac18e6eb584e37a08cfb2ba87 diff --git a/eng/Versions.props b/eng/Versions.props index 772999b5d21..c2bbc2632c4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,20 +57,20 @@ 9.0.0-beta.24065.5 9.0.0-beta.24065.5 - 9.0.0-alpha.1.24068.16 - 9.0.0-alpha.1.24068.16 + 9.0.0-preview.1.24075.4 + 9.0.0-preview.1.24075.4 2.0.0-beta4.24068.1 8.0.0-preview.24075.1 8.0.0-preview.24075.1 - 9.0.100-alpha.1.24070.3 + 9.0.100-preview.1.24078.4 9.0.0-preview.24075.1 - 9.0.0-alpha.1.24066.33 - 9.0.0-alpha.1.24066.33 + 9.0.0-preview.1.24074.8 + 9.0.0-preview.1.24074.8 1.0.507201 diff --git a/global.json b/global.json index 30ebc41f674..c92e2e19e4d 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "9.0.100-alpha.1.24067.4", + "dotnet": "9.0.100-preview.1.24076.14", "runtimes": { "aspnetcore": [ "$(MicrosoftAspNetCoreApp60Version)", diff --git a/src/Tests/CollectionRuleActions.UnitTests/CollectDumpActionTests.cs b/src/Tests/CollectionRuleActions.UnitTests/CollectDumpActionTests.cs index 0b3b042f712..41fa98c7db7 100644 --- a/src/Tests/CollectionRuleActions.UnitTests/CollectDumpActionTests.cs +++ b/src/Tests/CollectionRuleActions.UnitTests/CollectDumpActionTests.cs @@ -53,6 +53,13 @@ private async Task CollectDumpAction_SuccessCore(TargetFrameworkMoniker tfm, Dum return; } + // TODO net9.0temporary Linux dump collection does not work properly for .net90 + if (tfm == TargetFrameworkMoniker.Net90 + && !RuntimeInformation.IsOSPlatform(OSPlatform.Windows) && !RuntimeInformation.IsOSPlatform(OSPlatform.OSX)) + { + return; + } + using TemporaryDirectory tempDirectory = new(_outputHelper); await TestHostHelper.CreateCollectionRulesHost(_outputHelper, rootOptions => diff --git a/src/Tests/Microsoft.Diagnostics.Monitoring.TestCommon/Fixtures/AzuriteFixture.cs b/src/Tests/Microsoft.Diagnostics.Monitoring.TestCommon/Fixtures/AzuriteFixture.cs index 47d94505b80..47983d9a510 100644 --- a/src/Tests/Microsoft.Diagnostics.Monitoring.TestCommon/Fixtures/AzuriteFixture.cs +++ b/src/Tests/Microsoft.Diagnostics.Monitoring.TestCommon/Fixtures/AzuriteFixture.cs @@ -186,6 +186,12 @@ public void SkipTestIfNotAvailable() { throw new SkipTestException(_startupErrorMessage); } + + // TODO net9.0temporary Azure for net9.0 Linux arm64 does not work correctly + if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux) && (RuntimeInformation.ProcessArchitecture == Architecture.Arm64)) + { + throw new SkipTestException("Azure for net9.0 Linux arm64 does not work correctly"); + } } private void ParseAzuriteStartupOutput(object sender, DataReceivedEventArgs e) diff --git a/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests/DumpTests.cs b/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests/DumpTests.cs index 46354ad314d..e1ca3f3b17f 100644 --- a/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests/DumpTests.cs +++ b/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests/DumpTests.cs @@ -33,7 +33,7 @@ public DumpTests(ITestOutputHelper outputHelper, ServiceProviderFixture serviceP _outputHelper = outputHelper; } - [Theory] + [Theory(Skip = "net9.0temporary Linux dump collection does not work properly for .net90")] [InlineData(DiagnosticPortConnectionMode.Connect, DumpType.Full)] [InlineData(DiagnosticPortConnectionMode.Connect, DumpType.Mini)] [InlineData(DiagnosticPortConnectionMode.Connect, DumpType.Triage)] From 4a5d889846d70858b574d1a27a326b8df532eb88 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 29 Jan 2024 16:17:57 -0800 Subject: [PATCH 025/568] [feature/9.x] Update dependencies from dotnet/arcade (#5905) * Update dependencies from https://github.com/dotnet/arcade build 20240129.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.24065.5 -> To Version 9.0.0-beta.24079.1 * Temporarily suppress false positives from code analysis --------- Co-authored-by: dotnet-maestro[bot] Co-authored-by: Wiktor Kopec --- eng/Version.Details.xml | 20 +++++++++---------- eng/Versions.props | 6 +++--- eng/common/build.ps1 | 3 +++ eng/common/build.sh | 14 +++++++++++++ eng/common/cross/build-rootfs.sh | 14 ++++++------- eng/common/templates/steps/source-build.yml | 2 ++ global.json | 4 ++-- .../Eventing/ExceptionsEventSourceTests.cs | 3 +++ 8 files changed, 44 insertions(+), 22 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8b8161016fc..780e14b422b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,29 +22,29 @@ https://github.com/dotnet/roslyn-analyzers bf54e2bebc28004dec0311dc4083bcff4fd44cdb - + https://github.com/dotnet/arcade - 0d95a90310e5e2afbef31f4ca1c4b692698cd686 + b154d81a874b676ab32b0da421c8172831c577c0 - + https://github.com/dotnet/arcade - 0d95a90310e5e2afbef31f4ca1c4b692698cd686 + b154d81a874b676ab32b0da421c8172831c577c0 - + https://github.com/dotnet/arcade - 0d95a90310e5e2afbef31f4ca1c4b692698cd686 + b154d81a874b676ab32b0da421c8172831c577c0 - + https://github.com/dotnet/arcade - 0d95a90310e5e2afbef31f4ca1c4b692698cd686 + b154d81a874b676ab32b0da421c8172831c577c0 https://github.com/dotnet/installer efdeb117dd05a344009dd95ce25f265d313720ff - + https://github.com/dotnet/arcade - 0d95a90310e5e2afbef31f4ca1c4b692698cd686 + b154d81a874b676ab32b0da421c8172831c577c0 https://github.com/dotnet/symstore diff --git a/eng/Versions.props b/eng/Versions.props index c2bbc2632c4..109d6004da3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,9 +53,9 @@ --> - 9.0.0-beta.24065.5 - 9.0.0-beta.24065.5 - 9.0.0-beta.24065.5 + 9.0.0-beta.24079.1 + 9.0.0-beta.24079.1 + 9.0.0-beta.24079.1 9.0.0-preview.1.24075.4 9.0.0-preview.1.24075.4 diff --git a/eng/common/build.ps1 b/eng/common/build.ps1 index 066044f62f2..510458eb35b 100644 --- a/eng/common/build.ps1 +++ b/eng/common/build.ps1 @@ -20,6 +20,7 @@ Param( [switch] $publish, [switch] $clean, [switch] $verticalBuild, + [switch][Alias('pb')]$productBuild, [switch][Alias('bl')]$binaryLog, [switch][Alias('nobl')]$excludeCIBinarylog, [switch] $ci, @@ -60,6 +61,7 @@ function Print-Usage() { 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 " -productBuild Build the solution in the way it will be built in the full .NET product (VMR) build (short: -pb)" Write-Host "" Write-Host "Advanced settings:" @@ -122,6 +124,7 @@ function Build { /p:Deploy=$deploy ` /p:Test=$test ` /p:Pack=$pack ` + /p:DotNetBuildRepo=$($productBuild -or $verticalBuild) ` /p:ArcadeBuildVertical=$verticalBuild ` /p:IntegrationTest=$integrationTest ` /p:PerformanceTest=$performanceTest ` diff --git a/eng/common/build.sh b/eng/common/build.sh index 5ce01dd161a..bec7d02594f 100755 --- a/eng/common/build.sh +++ b/eng/common/build.sh @@ -22,6 +22,9 @@ usage() echo " --sourceBuild Source-build the solution (short: -sb)" echo " Will additionally trigger the following actions: --restore, --build, --pack" echo " If --configuration is not set explicitly, will also set it to 'Release'" + echo " --productBuild Build the solution in the way it will be built in the full .NET product (VMR) build (short: -pb)" + echo " Will additionally trigger the following actions: --restore, --build, --pack" + echo " If --configuration is not set explicitly, will also set it to 'Release'" echo " --rebuild Rebuild solution" echo " --test Run all unit tests in the solution (short: -t)" echo " --integrationTest Run all integration tests in the solution" @@ -60,6 +63,7 @@ restore=false build=false source_build=false vertical_build=false +product_build=false rebuild=false test=false integration_test=false @@ -127,12 +131,20 @@ while [[ $# > 0 ]]; do -sourcebuild|-sb) build=true source_build=true + product_build=true + restore=true + pack=true + ;; + -productBuild|-pb) + build=true + product_build=true restore=true pack=true ;; -verticalbuild|-vb) build=true vertical_build=true + product_build=true restore=true pack=true ;; @@ -226,7 +238,9 @@ function Build { /p:RepoRoot="$repo_root" \ /p:Restore=$restore \ /p:Build=$build \ + /p:DotNetBuildRepo=$product_build \ /p:ArcadeBuildFromSource=$source_build \ + /p:DotNetBuildSourceOnly=$source_build \ /p:ArcadeBuildVertical=$vertical_build \ /p:Rebuild=$rebuild \ /p:Test=$test \ diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index 9b2791cf568..99a9dd6bb60 100644 --- a/eng/common/cross/build-rootfs.sh +++ b/eng/common/cross/build-rootfs.sh @@ -8,7 +8,7 @@ usage() echo "BuildArch can be: arm(default), arm64, armel, armv6, ppc64le, riscv64, s390x, x64, x86" echo "CodeName - optional, Code name for Linux, can be: xenial(default), zesty, bionic, alpine" echo " for alpine can be specified with version: alpineX.YY or alpineedge" - echo " for FreeBSD can be: freebsd12, freebsd13" + echo " for FreeBSD can be: freebsd13, freebsd14" echo " for illumos can be: illumos" echo " for Haiku can be: haiku." echo "lldbx.y - optional, LLDB version, can be: lldb3.9(default), lldb4.0, lldb5.0, lldb6.0 no-lldb. Ignored for alpine and FreeBSD" @@ -71,9 +71,9 @@ __AlpinePackages+=" krb5-dev" __AlpinePackages+=" openssl-dev" __AlpinePackages+=" zlib-dev" -__FreeBSDBase="12.4-RELEASE" +__FreeBSDBase="13.2-RELEASE" __FreeBSDPkg="1.17.0" -__FreeBSDABI="12" +__FreeBSDABI="13" __FreeBSDPackages="libunwind" __FreeBSDPackages+=" icu" __FreeBSDPackages+=" libinotify" @@ -334,14 +334,14 @@ while :; do __AlpineVersion="$__AlpineMajorVersion.$__AlpineMinoVersion" fi ;; - freebsd12) + freebsd13) __CodeName=freebsd __SkipUnmount=1 ;; - freebsd13) + freebsd14) __CodeName=freebsd - __FreeBSDBase="13.2-RELEASE" - __FreeBSDABI="13" + __FreeBSDBase="14.0-RELEASE" + __FreeBSDABI="14" __SkipUnmount=1 ;; illumos) diff --git a/eng/common/templates/steps/source-build.yml b/eng/common/templates/steps/source-build.yml index 1d79797363d..32738aa9380 100644 --- a/eng/common/templates/steps/source-build.yml +++ b/eng/common/templates/steps/source-build.yml @@ -94,6 +94,8 @@ steps: $baseOsArgs \ /p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \ /p:ArcadeBuildFromSource=true \ + /p:DotNetBuildSourceOnly=true \ + /p:DotNetBuildRepo=true \ /p:AssetManifestFileName=$assetManifestFileName displayName: Build diff --git a/global.json b/global.json index c92e2e19e4d..56eb544e062 100644 --- a/global.json +++ b/global.json @@ -26,7 +26,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24065.5", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24065.5" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24079.1", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24079.1" } } diff --git a/src/Tests/Microsoft.Diagnostics.Monitoring.StartupHook.UnitTests/Exceptions/Eventing/ExceptionsEventSourceTests.cs b/src/Tests/Microsoft.Diagnostics.Monitoring.StartupHook.UnitTests/Exceptions/Eventing/ExceptionsEventSourceTests.cs index 685da3af35a..ccf242c404a 100644 --- a/src/Tests/Microsoft.Diagnostics.Monitoring.StartupHook.UnitTests/Exceptions/Eventing/ExceptionsEventSourceTests.cs +++ b/src/Tests/Microsoft.Diagnostics.Monitoring.StartupHook.UnitTests/Exceptions/Eventing/ExceptionsEventSourceTests.cs @@ -66,7 +66,10 @@ public void ExceptionsEventSource_WriteExceptionGroup_NotEnabled() } [Theory] +#pragma warning disable xUnit1012 //net9.0temporary Suppress false code analysis warnings + [InlineData(0, 0, null, "0,0,0", "", null, ActivityIdFormat.Unknown)] +#pragma warning restore xUnit1012 //net9.0temporary Suppress false code analysis warnings [InlineData(1, 5, "", "1,2", "1", NonEmptyGuidString, ActivityIdFormat.Hierarchical)] [InlineData(7, 13, InvalidOperationExceptionMessage, "", "3,5", NonEmptyGuidString, ActivityIdFormat.W3C)] [InlineData(ulong.MaxValue - 1, ulong.MaxValue - 1, OperationCancelledExceptionMessage, "3,5,7", "2", NonEmptyGuidString, ActivityIdFormat.W3C)] From c7b5c66b99dae397fd949bd2e499a2d2d423b4a8 Mon Sep 17 00:00:00 2001 From: Wiktor Kopec Date: Mon, 29 Jan 2024 17:24:43 -0800 Subject: [PATCH 026/568] Update net90 runtime references (#5907) * Update 90 package references * Fix build issue --- eng/helix/Helix.proj | 5 ++++- global.json | 12 ++++++++---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/eng/helix/Helix.proj b/eng/helix/Helix.proj index 45b27ab20f6..16fa4185d3c 100644 --- a/eng/helix/Helix.proj +++ b/eng/helix/Helix.proj @@ -132,7 +132,10 @@ aspnetcore-runtime - + + aspnetcore-runtime + + diff --git a/global.json b/global.json index 56eb544e062..c10573b5a75 100644 --- a/global.json +++ b/global.json @@ -5,22 +5,26 @@ "aspnetcore": [ "$(MicrosoftAspNetCoreApp60Version)", "$(MicrosoftAspNetCoreApp70Version)", - "$(MicrosoftAspNetCoreApp80Version)" + "$(MicrosoftAspNetCoreApp80Version)", + "$(MicrosoftAspNetCoreApp90Version)" ], "aspnetcore/x86": [ "$(MicrosoftAspNetCoreApp60Version)", "$(MicrosoftAspNetCoreApp70Version)", - "$(MicrosoftAspNetCoreApp80Version)" + "$(MicrosoftAspNetCoreApp80Version)", + "$(MicrosoftAspNetCoreApp90Version)" ], "dotnet": [ "$(MicrosoftNETCoreApp60Version)", "$(MicrosoftNETCoreApp70Version)", - "$(MicrosoftNETCoreApp80Version)" + "$(MicrosoftNETCoreApp80Version)", + "$(MicrosoftNETCoreApp90Version)" ], "dotnet/x86": [ "$(MicrosoftNETCoreApp60Version)", "$(MicrosoftNETCoreApp70Version)", - "$(MicrosoftNETCoreApp80Version)" + "$(MicrosoftNETCoreApp80Version)", + "$(MicrosoftNETCoreApp90Version)" ] } }, From 184189dcaa8044876ed1455431e47eda51d3d67c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 29 Jan 2024 18:40:09 -0800 Subject: [PATCH 027/568] [feature/9.x] Update dependencies from dotnet/diagnostics (#5901) * Update dependencies from https://github.com/dotnet/diagnostics build 20240126.1 Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe From Version 8.0.0-preview.24075.1 -> To Version 8.0.0-preview.24076.1 * Update dependencies from https://github.com/dotnet/diagnostics build 20240126.1 Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe From Version 8.0.0-preview.24075.1 -> To Version 8.0.0-preview.24076.1 * Update dependencies from https://github.com/dotnet/diagnostics build 20240126.1 Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe From Version 8.0.0-preview.24075.1 -> To Version 8.0.0-preview.24076.1 --------- Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 780e14b422b..ef698e70fa2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore 1d58b24591820b2a134cfc0a5e3154bf9fe65cb4 - + https://github.com/dotnet/diagnostics - d0967129f11b91b02d752025a0903e250eebeaad + 79b59c505405b9bee1d62dfa73dfb9750b2d4376 - + https://github.com/dotnet/diagnostics - d0967129f11b91b02d752025a0903e250eebeaad + 79b59c505405b9bee1d62dfa73dfb9750b2d4376 https://github.com/dotnet/command-line-api diff --git a/eng/Versions.props b/eng/Versions.props index 109d6004da3..b6be2120b90 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -62,8 +62,8 @@ 2.0.0-beta4.24068.1 - 8.0.0-preview.24075.1 - 8.0.0-preview.24075.1 + 8.0.0-preview.24076.1 + 8.0.0-preview.24076.1 9.0.100-preview.1.24078.4 From 1f021d4e8d1edcbefdcabab349fa40320999d0b9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 30 Jan 2024 09:30:01 -0800 Subject: [PATCH 028/568] Update dependencies from https://github.com/dotnet/installer build 20240130.2 (#5918) Microsoft.Dotnet.Sdk.Internal From Version 9.0.100-preview.1.24078.4 -> To Version 9.0.100-preview.1.24080.2 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ef698e70fa2..a473bb1eb47 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -38,9 +38,9 @@ https://github.com/dotnet/arcade b154d81a874b676ab32b0da421c8172831c577c0 - + https://github.com/dotnet/installer - efdeb117dd05a344009dd95ce25f265d313720ff + b8dce67ebe366f971308217b0e703e2a25eae16e https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index b6be2120b90..385071f1b40 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,7 +65,7 @@ 8.0.0-preview.24076.1 8.0.0-preview.24076.1 - 9.0.100-preview.1.24078.4 + 9.0.100-preview.1.24080.2 9.0.0-preview.24075.1 From dc41cba8827472ec287b6b42cd24127df75e1f0d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 30 Jan 2024 09:30:17 -0800 Subject: [PATCH 029/568] Update dependencies from https://github.com/dotnet/symstore build 20240129.1 (#5917) Microsoft.FileFormats From Version 1.0.507201 -> To Version 1.0.507901 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a473bb1eb47..275d55bca49 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -46,9 +46,9 @@ https://github.com/dotnet/arcade b154d81a874b676ab32b0da421c8172831c577c0 - + https://github.com/dotnet/symstore - 130f269d4162ead65afc7992205cd5a0fe9a22b8 + 0c7b75fc18db3a4f9b7737ae55a0d04e913ac40c https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 385071f1b40..5347d7e0b37 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -72,7 +72,7 @@ 9.0.0-preview.1.24074.8 9.0.0-preview.1.24074.8 - 1.0.507201 + 1.0.507901 $(MicrosoftNETCoreApp31Version) From 752d685cd71695be8a6be6c20c0410f12f63521e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 30 Jan 2024 09:30:34 -0800 Subject: [PATCH 030/568] Update dependencies from https://github.com/dotnet/arcade build 20240130.1 (#5916) Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.24079.1 -> To Version 9.0.0-beta.24080.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- global.json | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 275d55bca49..69cb0d8bc93 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,29 +22,29 @@ https://github.com/dotnet/roslyn-analyzers bf54e2bebc28004dec0311dc4083bcff4fd44cdb - + https://github.com/dotnet/arcade - b154d81a874b676ab32b0da421c8172831c577c0 + dd50030a0278e8c82f45624446fbec120b83c26b - + https://github.com/dotnet/arcade - b154d81a874b676ab32b0da421c8172831c577c0 + dd50030a0278e8c82f45624446fbec120b83c26b - + https://github.com/dotnet/arcade - b154d81a874b676ab32b0da421c8172831c577c0 + dd50030a0278e8c82f45624446fbec120b83c26b - + https://github.com/dotnet/arcade - b154d81a874b676ab32b0da421c8172831c577c0 + dd50030a0278e8c82f45624446fbec120b83c26b https://github.com/dotnet/installer b8dce67ebe366f971308217b0e703e2a25eae16e - + https://github.com/dotnet/arcade - b154d81a874b676ab32b0da421c8172831c577c0 + dd50030a0278e8c82f45624446fbec120b83c26b https://github.com/dotnet/symstore diff --git a/eng/Versions.props b/eng/Versions.props index 5347d7e0b37..aba37c27f26 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,9 +53,9 @@ --> - 9.0.0-beta.24079.1 - 9.0.0-beta.24079.1 - 9.0.0-beta.24079.1 + 9.0.0-beta.24080.1 + 9.0.0-beta.24080.1 + 9.0.0-beta.24080.1 9.0.0-preview.1.24075.4 9.0.0-preview.1.24075.4 diff --git a/global.json b/global.json index c10573b5a75..f7f7370dcba 100644 --- a/global.json +++ b/global.json @@ -30,7 +30,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24079.1", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24079.1" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24080.1", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24080.1" } } From 424f45c518df1db187759b291d4518c6ad037553 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 30 Jan 2024 10:15:28 -0800 Subject: [PATCH 031/568] Update dependencies from https://github.com/dotnet/diagnostics build 20240129.1 (#5915) Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe From Version 8.0.0-preview.24076.1 -> To Version 8.0.0-preview.24079.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 69cb0d8bc93..83a4e6bd4ec 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore 1d58b24591820b2a134cfc0a5e3154bf9fe65cb4 - + https://github.com/dotnet/diagnostics - 79b59c505405b9bee1d62dfa73dfb9750b2d4376 + 254f6b2591928b0d0955222fd3ff84fca025fee7 - + https://github.com/dotnet/diagnostics - 79b59c505405b9bee1d62dfa73dfb9750b2d4376 + 254f6b2591928b0d0955222fd3ff84fca025fee7 https://github.com/dotnet/command-line-api diff --git a/eng/Versions.props b/eng/Versions.props index aba37c27f26..512d0e8996b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -62,8 +62,8 @@ 2.0.0-beta4.24068.1 - 8.0.0-preview.24076.1 - 8.0.0-preview.24076.1 + 8.0.0-preview.24079.1 + 8.0.0-preview.24079.1 9.0.100-preview.1.24080.2 From c1f7510a8a5494d83dea2ee770534d055b3c45eb Mon Sep 17 00:00:00 2001 From: Wiktor Kopec Date: Tue, 30 Jan 2024 10:18:13 -0800 Subject: [PATCH 032/568] Update xcopy (#5912) * Update xcopy * Fix version --- global.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/global.json b/global.json index f7f7370dcba..d8a0624cd9e 100644 --- a/global.json +++ b/global.json @@ -26,7 +26,8 @@ "$(MicrosoftNETCoreApp80Version)", "$(MicrosoftNETCoreApp90Version)" ] - } + }, + "xcopy-msbuild": "17.8.5" }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", From f1ab9c7321787593558aefe4c3602ea94bf251db Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 31 Jan 2024 09:40:21 -0800 Subject: [PATCH 033/568] Update dependencies from https://github.com/dotnet/installer build 20240130.9 (#5938) Microsoft.Dotnet.Sdk.Internal From Version 9.0.100-preview.1.24080.2 -> To Version 9.0.100-preview.1.24080.9 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 83a4e6bd4ec..af8fcce23fd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -38,9 +38,9 @@ https://github.com/dotnet/arcade dd50030a0278e8c82f45624446fbec120b83c26b - + https://github.com/dotnet/installer - b8dce67ebe366f971308217b0e703e2a25eae16e + 46ba867793d0599759fbb8f1ac07a3f75cb2ea9d https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 512d0e8996b..d16c303f9fb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,7 +65,7 @@ 8.0.0-preview.24079.1 8.0.0-preview.24079.1 - 9.0.100-preview.1.24080.2 + 9.0.100-preview.1.24080.9 9.0.0-preview.24075.1 From c75164eee255bac4a5352027e598f679beb9f16c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 31 Jan 2024 09:40:40 -0800 Subject: [PATCH 034/568] Update dependencies from https://github.com/dotnet/arcade build 20240130.3 (#5936) Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.24080.1 -> To Version 9.0.0-beta.24080.3 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 20 +++++++++---------- eng/Versions.props | 6 +++--- .../templates/job/source-index-stage1.yml | 2 +- global.json | 4 ++-- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index af8fcce23fd..13bcc679149 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,29 +22,29 @@ https://github.com/dotnet/roslyn-analyzers bf54e2bebc28004dec0311dc4083bcff4fd44cdb - + https://github.com/dotnet/arcade - dd50030a0278e8c82f45624446fbec120b83c26b + b4e9225c6c2f9da42fbb611a5e8942a08476fe89 - + https://github.com/dotnet/arcade - dd50030a0278e8c82f45624446fbec120b83c26b + b4e9225c6c2f9da42fbb611a5e8942a08476fe89 - + https://github.com/dotnet/arcade - dd50030a0278e8c82f45624446fbec120b83c26b + b4e9225c6c2f9da42fbb611a5e8942a08476fe89 - + https://github.com/dotnet/arcade - dd50030a0278e8c82f45624446fbec120b83c26b + b4e9225c6c2f9da42fbb611a5e8942a08476fe89 https://github.com/dotnet/installer 46ba867793d0599759fbb8f1ac07a3f75cb2ea9d - + https://github.com/dotnet/arcade - dd50030a0278e8c82f45624446fbec120b83c26b + b4e9225c6c2f9da42fbb611a5e8942a08476fe89 https://github.com/dotnet/symstore diff --git a/eng/Versions.props b/eng/Versions.props index d16c303f9fb..b9bb18e3348 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,9 +53,9 @@ --> - 9.0.0-beta.24080.1 - 9.0.0-beta.24080.1 - 9.0.0-beta.24080.1 + 9.0.0-beta.24080.3 + 9.0.0-beta.24080.3 + 9.0.0-beta.24080.3 9.0.0-preview.1.24075.4 9.0.0-preview.1.24075.4 diff --git a/eng/common/templates/job/source-index-stage1.yml b/eng/common/templates/job/source-index-stage1.yml index 79523366262..b5a3e5c4a6c 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-20231213.4 + sourceIndexPackageVersion: 1.0.1-20240129.2 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: [] diff --git a/global.json b/global.json index d8a0624cd9e..f0c6a2282b9 100644 --- a/global.json +++ b/global.json @@ -31,7 +31,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24080.1", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24080.1" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24080.3", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24080.3" } } From 5f259c81ec7c701d38f96e5d64a8f25726dcf213 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 31 Jan 2024 09:41:16 -0800 Subject: [PATCH 035/568] Update dependencies from https://github.com/dotnet/diagnostics build 20240130.1 (#5935) Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe From Version 8.0.0-preview.24079.1 -> To Version 8.0.0-preview.24080.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 13bcc679149..7d2e38b934d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore 1d58b24591820b2a134cfc0a5e3154bf9fe65cb4 - + https://github.com/dotnet/diagnostics - 254f6b2591928b0d0955222fd3ff84fca025fee7 + ea5321da3def7bd803c356504e681edc64ca4629 - + https://github.com/dotnet/diagnostics - 254f6b2591928b0d0955222fd3ff84fca025fee7 + ea5321da3def7bd803c356504e681edc64ca4629 https://github.com/dotnet/command-line-api diff --git a/eng/Versions.props b/eng/Versions.props index b9bb18e3348..ea393172f65 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -62,8 +62,8 @@ 2.0.0-beta4.24068.1 - 8.0.0-preview.24079.1 - 8.0.0-preview.24079.1 + 8.0.0-preview.24080.1 + 8.0.0-preview.24080.1 9.0.100-preview.1.24080.9 From fc12528dc54bed3e1f3f15540d1d074346e85cbc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 1 Feb 2024 09:12:10 -0800 Subject: [PATCH 036/568] Update dependencies from https://github.com/dotnet/installer build 20240201.2 (#5946) Microsoft.Dotnet.Sdk.Internal From Version 9.0.100-preview.1.24080.9 -> To Version 9.0.100-preview.1.24101.2 Dependency coherency updates Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0 From Version 9.0.0-preview.1.24075.4 -> To Version 9.0.0-preview.1.24081.5 (parent: Microsoft.Dotnet.Sdk.Internal Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7d2e38b934d..c5f7dbd988a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/aspnetcore - 1d58b24591820b2a134cfc0a5e3154bf9fe65cb4 + b1beadfe0ad3d02eb5207681a5328793c4b3822c https://github.com/dotnet/diagnostics @@ -38,9 +38,9 @@ https://github.com/dotnet/arcade b4e9225c6c2f9da42fbb611a5e8942a08476fe89 - + https://github.com/dotnet/installer - 46ba867793d0599759fbb8f1ac07a3f75cb2ea9d + 6bbd460f4db0a37cafeb04a1ed2d798ae56b0283 https://github.com/dotnet/arcade @@ -50,17 +50,17 @@ https://github.com/dotnet/symstore 0c7b75fc18db3a4f9b7737ae55a0d04e913ac40c - + https://github.com/dotnet/runtime - b4aa81d9da52616ac18e6eb584e37a08cfb2ba87 + 1d1bf92fcf43aa6981804dc53c5174445069c9e4 - + https://github.com/dotnet/aspnetcore - 1d58b24591820b2a134cfc0a5e3154bf9fe65cb4 + b1beadfe0ad3d02eb5207681a5328793c4b3822c - + https://github.com/dotnet/runtime - b4aa81d9da52616ac18e6eb584e37a08cfb2ba87 + 1d1bf92fcf43aa6981804dc53c5174445069c9e4 diff --git a/eng/Versions.props b/eng/Versions.props index ea393172f65..fd133a55c20 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,20 +57,20 @@ 9.0.0-beta.24080.3 9.0.0-beta.24080.3 - 9.0.0-preview.1.24075.4 - 9.0.0-preview.1.24075.4 + 9.0.0-preview.1.24081.5 + 9.0.0-preview.1.24081.5 2.0.0-beta4.24068.1 8.0.0-preview.24080.1 8.0.0-preview.24080.1 - 9.0.100-preview.1.24080.9 + 9.0.100-preview.1.24101.2 9.0.0-preview.24075.1 - 9.0.0-preview.1.24074.8 - 9.0.0-preview.1.24074.8 + 9.0.0-preview.1.24080.9 + 9.0.0-preview.1.24080.9 1.0.507901 From ad6fe0d708da53f6cb6a8d86e6f6cb51780abf7b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 1 Feb 2024 09:12:28 -0800 Subject: [PATCH 037/568] Update dependencies from https://github.com/dotnet/arcade build 20240131.4 (#5944) Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.24080.3 -> To Version 9.0.0-beta.24081.4 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- eng/common/sdk-task.ps1 | 2 +- eng/common/tools.ps1 | 4 ++-- global.json | 4 ++-- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c5f7dbd988a..e921eff25e0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,29 +22,29 @@ https://github.com/dotnet/roslyn-analyzers bf54e2bebc28004dec0311dc4083bcff4fd44cdb - + https://github.com/dotnet/arcade - b4e9225c6c2f9da42fbb611a5e8942a08476fe89 + 438a8e2488313fb3aa1b24a741a85c2669ee7e0d - + https://github.com/dotnet/arcade - b4e9225c6c2f9da42fbb611a5e8942a08476fe89 + 438a8e2488313fb3aa1b24a741a85c2669ee7e0d - + https://github.com/dotnet/arcade - b4e9225c6c2f9da42fbb611a5e8942a08476fe89 + 438a8e2488313fb3aa1b24a741a85c2669ee7e0d - + https://github.com/dotnet/arcade - b4e9225c6c2f9da42fbb611a5e8942a08476fe89 + 438a8e2488313fb3aa1b24a741a85c2669ee7e0d https://github.com/dotnet/installer 6bbd460f4db0a37cafeb04a1ed2d798ae56b0283 - + https://github.com/dotnet/arcade - b4e9225c6c2f9da42fbb611a5e8942a08476fe89 + 438a8e2488313fb3aa1b24a741a85c2669ee7e0d https://github.com/dotnet/symstore diff --git a/eng/Versions.props b/eng/Versions.props index fd133a55c20..a85ddd512b8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,9 +53,9 @@ --> - 9.0.0-beta.24080.3 - 9.0.0-beta.24080.3 - 9.0.0-beta.24080.3 + 9.0.0-beta.24081.4 + 9.0.0-beta.24081.4 + 9.0.0-beta.24081.4 9.0.0-preview.1.24081.5 9.0.0-preview.1.24081.5 diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1 index 73828dd30d3..091023970f1 100644 --- a/eng/common/sdk-task.ps1 +++ b/eng/common/sdk-task.ps1 @@ -64,7 +64,7 @@ try { $GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty } if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) { - $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.8.1-2" -MemberType NoteProperty + $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.8.5" -MemberType NoteProperty } if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") { $xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 0da65b5748a..a8f8edb3291 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -379,8 +379,8 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements = # If the version of msbuild is going to be xcopied, # use this version. Version matches a package here: - # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/RoslynTools.MSBuild/versions/17.8.1-2 - $defaultXCopyMSBuildVersion = '17.8.1-2' + # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/RoslynTools.MSBuild/versions/17.8.5 + $defaultXCopyMSBuildVersion = '17.8.5' if (!$vsRequirements) { if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') { diff --git a/global.json b/global.json index f0c6a2282b9..aa1271b9ff9 100644 --- a/global.json +++ b/global.json @@ -31,7 +31,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24080.3", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24080.3" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24081.4", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24081.4" } } From dcfb7dfb1956905ad77a79d5fa3b1e0a40073eeb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 1 Feb 2024 09:12:44 -0800 Subject: [PATCH 038/568] Update dependencies from https://github.com/dotnet/diagnostics build 20240131.1 (#5943) Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe From Version 8.0.0-preview.24080.1 -> To Version 8.0.0-preview.24081.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e921eff25e0..92e720372b7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore b1beadfe0ad3d02eb5207681a5328793c4b3822c - + https://github.com/dotnet/diagnostics - ea5321da3def7bd803c356504e681edc64ca4629 + dd6e8b06597454cb532541173a0893fac6b1df32 - + https://github.com/dotnet/diagnostics - ea5321da3def7bd803c356504e681edc64ca4629 + dd6e8b06597454cb532541173a0893fac6b1df32 https://github.com/dotnet/command-line-api diff --git a/eng/Versions.props b/eng/Versions.props index a85ddd512b8..b10e7896925 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -62,8 +62,8 @@ 2.0.0-beta4.24068.1 - 8.0.0-preview.24080.1 - 8.0.0-preview.24080.1 + 8.0.0-preview.24081.1 + 8.0.0-preview.24081.1 9.0.100-preview.1.24101.2 From 536bdedf1b8fefc2c9e16b7117421b569834ffc3 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 1 Feb 2024 13:37:39 -0800 Subject: [PATCH 039/568] Fixup dependencies (#5949) (#5950) Co-authored-by: Wiktor Kopec --- eng/dependabot/Versions.props | 2 +- eng/dependabot/net6.0/Versions.props | 2 +- eng/dependabot/net7.0/Versions.props | 2 +- eng/dependabot/net8.0/Versions.props | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/dependabot/Versions.props b/eng/dependabot/Versions.props index e070f1328e9..befaf63d821 100644 --- a/eng/dependabot/Versions.props +++ b/eng/dependabot/Versions.props @@ -5,7 +5,7 @@ 1.10.4 12.19.1 12.17.1 - 2.15.3 + 2.16.1 1.6.11 4.3.2 5.0.0 diff --git a/eng/dependabot/net6.0/Versions.props b/eng/dependabot/net6.0/Versions.props index fef6e983b2a..d3ee0d85e2d 100644 --- a/eng/dependabot/net6.0/Versions.props +++ b/eng/dependabot/net6.0/Versions.props @@ -10,6 +10,6 @@ 6.0.0 - 6.0.25 + 6.0.26 diff --git a/eng/dependabot/net7.0/Versions.props b/eng/dependabot/net7.0/Versions.props index 8e02e196398..9081b609ba5 100644 --- a/eng/dependabot/net7.0/Versions.props +++ b/eng/dependabot/net7.0/Versions.props @@ -10,6 +10,6 @@ 7.0.0 - 7.0.14 + 7.0.15 diff --git a/eng/dependabot/net8.0/Versions.props b/eng/dependabot/net8.0/Versions.props index 98e5ea8d781..bd2a060ebc6 100644 --- a/eng/dependabot/net8.0/Versions.props +++ b/eng/dependabot/net8.0/Versions.props @@ -10,6 +10,6 @@ 8.0.0 - 8.0.0 + 8.0.1 From c1dc0e6f88406062ed4cfb2206b8477e88062dc5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 2 Feb 2024 09:21:15 -0800 Subject: [PATCH 040/568] Update dependencies from https://github.com/dotnet/diagnostics build 20240201.1 (#5955) Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe From Version 8.0.0-preview.24081.1 -> To Version 8.0.0-preview.24101.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 92e720372b7..91055f56326 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore b1beadfe0ad3d02eb5207681a5328793c4b3822c - + https://github.com/dotnet/diagnostics - dd6e8b06597454cb532541173a0893fac6b1df32 + ab997a03a80e55adde06087c1cb810fcfe257f8e - + https://github.com/dotnet/diagnostics - dd6e8b06597454cb532541173a0893fac6b1df32 + ab997a03a80e55adde06087c1cb810fcfe257f8e https://github.com/dotnet/command-line-api diff --git a/eng/Versions.props b/eng/Versions.props index b10e7896925..33e6fc68743 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -62,8 +62,8 @@ 2.0.0-beta4.24068.1 - 8.0.0-preview.24081.1 - 8.0.0-preview.24081.1 + 8.0.0-preview.24101.1 + 8.0.0-preview.24101.1 9.0.100-preview.1.24101.2 From d5460f7cb310a7dfeaeb1a565081fc098676ba13 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 2 Feb 2024 09:21:33 -0800 Subject: [PATCH 041/568] Update dependencies from https://github.com/dotnet/command-line-api build 20240201.1 (#5956) System.CommandLine From Version 2.0.0-beta4.24068.1 -> To Version 2.0.0-beta4.24101.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 91055f56326..c58acd87755 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -12,9 +12,9 @@ https://github.com/dotnet/diagnostics ab997a03a80e55adde06087c1cb810fcfe257f8e - + https://github.com/dotnet/command-line-api - ecd2ce5eafbba3008a7d4f5d04b025d30928c812 + 3674f88896ded1be30c77b14196773372a2ddfac diff --git a/eng/Versions.props b/eng/Versions.props index 33e6fc68743..525d8f98f0d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -60,7 +60,7 @@ 9.0.0-preview.1.24081.5 9.0.0-preview.1.24081.5 - 2.0.0-beta4.24068.1 + 2.0.0-beta4.24101.1 8.0.0-preview.24101.1 8.0.0-preview.24101.1 From 9a0700c774a3dfa5d805565022d55bc96841b039 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 2 Feb 2024 10:59:23 -0800 Subject: [PATCH 042/568] Update dependencies from https://github.com/dotnet/installer build 20240201.4 (#5960) Microsoft.Dotnet.Sdk.Internal From Version 9.0.100-preview.1.24101.2 -> To Version 9.0.100-preview.1.24101.4 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c58acd87755..00ce636c882 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -38,9 +38,9 @@ https://github.com/dotnet/arcade 438a8e2488313fb3aa1b24a741a85c2669ee7e0d - + https://github.com/dotnet/installer - 6bbd460f4db0a37cafeb04a1ed2d798ae56b0283 + 103ff6d4866ae1feff84a1865df0c1a7494ceffc https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 525d8f98f0d..d0706ad60fa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,7 +65,7 @@ 8.0.0-preview.24101.1 8.0.0-preview.24101.1 - 9.0.100-preview.1.24101.2 + 9.0.100-preview.1.24101.4 9.0.0-preview.24075.1 From c0ea0a2de9a20932720093d7df350fccc1d41ff6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 2 Feb 2024 10:59:37 -0800 Subject: [PATCH 043/568] Update dependencies from https://github.com/dotnet/arcade build 20240201.2 (#5957) Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.24081.4 -> To Version 9.0.0-beta.24101.2 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- global.json | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 00ce636c882..cf68c52f3a1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,29 +22,29 @@ https://github.com/dotnet/roslyn-analyzers bf54e2bebc28004dec0311dc4083bcff4fd44cdb - + https://github.com/dotnet/arcade - 438a8e2488313fb3aa1b24a741a85c2669ee7e0d + db8765409d91a7ac626f5ff932459876a5bea9c6 - + https://github.com/dotnet/arcade - 438a8e2488313fb3aa1b24a741a85c2669ee7e0d + db8765409d91a7ac626f5ff932459876a5bea9c6 - + https://github.com/dotnet/arcade - 438a8e2488313fb3aa1b24a741a85c2669ee7e0d + db8765409d91a7ac626f5ff932459876a5bea9c6 - + https://github.com/dotnet/arcade - 438a8e2488313fb3aa1b24a741a85c2669ee7e0d + db8765409d91a7ac626f5ff932459876a5bea9c6 https://github.com/dotnet/installer 103ff6d4866ae1feff84a1865df0c1a7494ceffc - + https://github.com/dotnet/arcade - 438a8e2488313fb3aa1b24a741a85c2669ee7e0d + db8765409d91a7ac626f5ff932459876a5bea9c6 https://github.com/dotnet/symstore diff --git a/eng/Versions.props b/eng/Versions.props index d0706ad60fa..bfda5dbb6b7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,9 +53,9 @@ --> - 9.0.0-beta.24081.4 - 9.0.0-beta.24081.4 - 9.0.0-beta.24081.4 + 9.0.0-beta.24101.2 + 9.0.0-beta.24101.2 + 9.0.0-beta.24101.2 9.0.0-preview.1.24081.5 9.0.0-preview.1.24081.5 diff --git a/global.json b/global.json index aa1271b9ff9..fd5699cf856 100644 --- a/global.json +++ b/global.json @@ -31,7 +31,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24081.4", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24081.4" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24101.2", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24101.2" } } From 60ea17521f3aa3751c382c72ec6fd1885db6c67a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 5 Feb 2024 13:27:05 -0800 Subject: [PATCH 044/568] [feature/9.x] Update dependencies from dotnet/arcade (#5970) * Update dependencies from https://github.com/dotnet/arcade build 20240202.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.24101.2 -> To Version 9.0.0-beta.24102.4 * Update dependencies from https://github.com/dotnet/arcade build 20240202.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.24101.2 -> To Version 9.0.0-beta.24102.4 * Update dependencies from https://github.com/dotnet/arcade build 20240202.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.24101.2 -> To Version 9.0.0-beta.24102.4 --------- Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- global.json | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cf68c52f3a1..bc90e5c8f3b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,29 +22,29 @@ https://github.com/dotnet/roslyn-analyzers bf54e2bebc28004dec0311dc4083bcff4fd44cdb - + https://github.com/dotnet/arcade - db8765409d91a7ac626f5ff932459876a5bea9c6 + 2fb543a45580400a559b5ae41c96a815ea14dac5 - + https://github.com/dotnet/arcade - db8765409d91a7ac626f5ff932459876a5bea9c6 + 2fb543a45580400a559b5ae41c96a815ea14dac5 - + https://github.com/dotnet/arcade - db8765409d91a7ac626f5ff932459876a5bea9c6 + 2fb543a45580400a559b5ae41c96a815ea14dac5 - + https://github.com/dotnet/arcade - db8765409d91a7ac626f5ff932459876a5bea9c6 + 2fb543a45580400a559b5ae41c96a815ea14dac5 https://github.com/dotnet/installer 103ff6d4866ae1feff84a1865df0c1a7494ceffc - + https://github.com/dotnet/arcade - db8765409d91a7ac626f5ff932459876a5bea9c6 + 2fb543a45580400a559b5ae41c96a815ea14dac5 https://github.com/dotnet/symstore diff --git a/eng/Versions.props b/eng/Versions.props index bfda5dbb6b7..26afa01d141 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,9 +53,9 @@ --> - 9.0.0-beta.24101.2 - 9.0.0-beta.24101.2 - 9.0.0-beta.24101.2 + 9.0.0-beta.24102.4 + 9.0.0-beta.24102.4 + 9.0.0-beta.24102.4 9.0.0-preview.1.24081.5 9.0.0-preview.1.24081.5 diff --git a/global.json b/global.json index fd5699cf856..75ae5dc037e 100644 --- a/global.json +++ b/global.json @@ -31,7 +31,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24101.2", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24101.2" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24102.4", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24102.4" } } From a381e0cb2e95c1cb4ffce652bfa9723df8d72f73 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 5 Feb 2024 13:27:50 -0800 Subject: [PATCH 045/568] [feature/9.x] Update dependencies from dotnet/command-line-api (#5969) * Update dependencies from https://github.com/dotnet/command-line-api build 20240202.1 System.CommandLine From Version 2.0.0-beta4.24101.1 -> To Version 2.0.0-beta4.24102.1 * Update dependencies from https://github.com/dotnet/command-line-api build 20240202.1 System.CommandLine From Version 2.0.0-beta4.24101.1 -> To Version 2.0.0-beta4.24102.1 * Update dependencies from https://github.com/dotnet/command-line-api build 20240202.1 System.CommandLine From Version 2.0.0-beta4.24101.1 -> To Version 2.0.0-beta4.24102.1 --------- Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bc90e5c8f3b..09fee0022cb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -12,9 +12,9 @@ https://github.com/dotnet/diagnostics ab997a03a80e55adde06087c1cb810fcfe257f8e - + https://github.com/dotnet/command-line-api - 3674f88896ded1be30c77b14196773372a2ddfac + 46fea71e3d98dad0d676950522004b7f295dd372 diff --git a/eng/Versions.props b/eng/Versions.props index 26afa01d141..2cefda09428 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -60,7 +60,7 @@ 9.0.0-preview.1.24081.5 9.0.0-preview.1.24081.5 - 2.0.0-beta4.24101.1 + 2.0.0-beta4.24102.1 8.0.0-preview.24101.1 8.0.0-preview.24101.1 From f932b6d93d61d2507af3ac2820a05ec12a76f2a8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 5 Feb 2024 17:04:12 -0800 Subject: [PATCH 046/568] [feature/9.x] Update dependencies from dotnet/diagnostics (#5968) * Update dependencies from https://github.com/dotnet/diagnostics build 20240202.1 Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe From Version 8.0.0-preview.24101.1 -> To Version 8.0.0-preview.24102.1 * Update dependencies from https://github.com/dotnet/diagnostics build 20240202.1 Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe From Version 8.0.0-preview.24101.1 -> To Version 8.0.0-preview.24102.1 * Update dependencies from https://github.com/dotnet/diagnostics build 20240202.1 Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe From Version 8.0.0-preview.24101.1 -> To Version 8.0.0-preview.24102.1 --------- Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 09fee0022cb..a0ef15d865f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore b1beadfe0ad3d02eb5207681a5328793c4b3822c - + https://github.com/dotnet/diagnostics - ab997a03a80e55adde06087c1cb810fcfe257f8e + 1ec19cec00fa8b9581f231b16e2d0681b82974bb - + https://github.com/dotnet/diagnostics - ab997a03a80e55adde06087c1cb810fcfe257f8e + 1ec19cec00fa8b9581f231b16e2d0681b82974bb https://github.com/dotnet/command-line-api diff --git a/eng/Versions.props b/eng/Versions.props index 2cefda09428..87e1731cc7a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -62,8 +62,8 @@ 2.0.0-beta4.24102.1 - 8.0.0-preview.24101.1 - 8.0.0-preview.24101.1 + 8.0.0-preview.24102.1 + 8.0.0-preview.24102.1 9.0.100-preview.1.24101.4 From 9407c5b87725b2ab0506a024ed1ea238a4584f02 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 6 Feb 2024 18:33:08 +0000 Subject: [PATCH 047/568] Update dependencies from https://github.com/dotnet/diagnostics build 20240205.2 (#5984) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a0ef15d865f..9ed3e4b32db 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore b1beadfe0ad3d02eb5207681a5328793c4b3822c - + https://github.com/dotnet/diagnostics - 1ec19cec00fa8b9581f231b16e2d0681b82974bb + 47652575bc89e980d85a9f142a41352ffc391788 - + https://github.com/dotnet/diagnostics - 1ec19cec00fa8b9581f231b16e2d0681b82974bb + 47652575bc89e980d85a9f142a41352ffc391788 https://github.com/dotnet/command-line-api diff --git a/eng/Versions.props b/eng/Versions.props index 87e1731cc7a..8ef1468da8e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -62,8 +62,8 @@ 2.0.0-beta4.24102.1 - 8.0.0-preview.24102.1 - 8.0.0-preview.24102.1 + 8.0.0-preview.24105.2 + 8.0.0-preview.24105.2 9.0.100-preview.1.24101.4 From 965fa721d753404617e990f80165d0585c59cba7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 6 Feb 2024 10:35:53 -0800 Subject: [PATCH 048/568] Update dependencies from https://github.com/dotnet/symstore build 20240205.1 (#5987) Microsoft.FileFormats From Version 1.0.507901 -> To Version 1.0.510501 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9ed3e4b32db..1eaf2a6a9ae 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -46,9 +46,9 @@ https://github.com/dotnet/arcade 2fb543a45580400a559b5ae41c96a815ea14dac5 - + https://github.com/dotnet/symstore - 0c7b75fc18db3a4f9b7737ae55a0d04e913ac40c + 36d076932232b23c4e2de271e894b23a16c34ef6 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 8ef1468da8e..68165ac02d2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -72,7 +72,7 @@ 9.0.0-preview.1.24080.9 9.0.0-preview.1.24080.9 - 1.0.507901 + 1.0.510501 $(MicrosoftNETCoreApp31Version) From 5f0050af9a5a966afd699a4c69ddf2491dd251cc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 6 Feb 2024 10:36:03 -0800 Subject: [PATCH 049/568] Update dependencies from https://github.com/dotnet/arcade build 20240205.3 (#5985) Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.24102.4 -> To Version 9.0.0-beta.24105.3 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- eng/common/native/init-os-and-arch.sh | 4 ++++ eng/common/tools.ps1 | 6 +++--- global.json | 4 ++-- 5 files changed, 22 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1eaf2a6a9ae..110d8e42c39 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,29 +22,29 @@ https://github.com/dotnet/roslyn-analyzers bf54e2bebc28004dec0311dc4083bcff4fd44cdb - + https://github.com/dotnet/arcade - 2fb543a45580400a559b5ae41c96a815ea14dac5 + 8cfc9489d3e51071fedec9dcb99071dc912718bd - + https://github.com/dotnet/arcade - 2fb543a45580400a559b5ae41c96a815ea14dac5 + 8cfc9489d3e51071fedec9dcb99071dc912718bd - + https://github.com/dotnet/arcade - 2fb543a45580400a559b5ae41c96a815ea14dac5 + 8cfc9489d3e51071fedec9dcb99071dc912718bd - + https://github.com/dotnet/arcade - 2fb543a45580400a559b5ae41c96a815ea14dac5 + 8cfc9489d3e51071fedec9dcb99071dc912718bd https://github.com/dotnet/installer 103ff6d4866ae1feff84a1865df0c1a7494ceffc - + https://github.com/dotnet/arcade - 2fb543a45580400a559b5ae41c96a815ea14dac5 + 8cfc9489d3e51071fedec9dcb99071dc912718bd https://github.com/dotnet/symstore diff --git a/eng/Versions.props b/eng/Versions.props index 68165ac02d2..10dee6b35d5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,9 +53,9 @@ --> - 9.0.0-beta.24102.4 - 9.0.0-beta.24102.4 - 9.0.0-beta.24102.4 + 9.0.0-beta.24105.3 + 9.0.0-beta.24105.3 + 9.0.0-beta.24105.3 9.0.0-preview.1.24081.5 9.0.0-preview.1.24081.5 diff --git a/eng/common/native/init-os-and-arch.sh b/eng/common/native/init-os-and-arch.sh index e693617a6c2..caa448ff030 100644 --- a/eng/common/native/init-os-and-arch.sh +++ b/eng/common/native/init-os-and-arch.sh @@ -35,6 +35,10 @@ fi case "$CPUName" in arm64|aarch64) arch=arm64 + if [ "$(getconf LONG_BIT)" -lt 64 ]; then + # This is 32-bit OS running on 64-bit CPU (for example Raspberry Pi OS) + arch=arm + fi ;; loongarch64) diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index a8f8edb3291..7d8dc89b919 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -379,7 +379,7 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements = # If the version of msbuild is going to be xcopied, # use this version. Version matches a package here: - # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/RoslynTools.MSBuild/versions/17.8.5 + # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.DotNet.Arcade.MSBuild.Xcopy/versions/17.8.5 $defaultXCopyMSBuildVersion = '17.8.5' if (!$vsRequirements) { @@ -445,7 +445,7 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements = if ($xcopyMSBuildVersion.Trim() -ine "none") { $vsInstallDir = InitializeXCopyMSBuild $xcopyMSBuildVersion $install if ($vsInstallDir -eq $null) { - throw "Could not xcopy msbuild. Please check that package 'RoslynTools.MSBuild @ $xcopyMSBuildVersion' exists on feed 'dotnet-eng'." + throw "Could not xcopy msbuild. Please check that package 'Microsoft.DotNet.Arcade.MSBuild.Xcopy @ $xcopyMSBuildVersion' exists on feed 'dotnet-eng'." } } if ($vsInstallDir -eq $null) { @@ -482,7 +482,7 @@ function InstallXCopyMSBuild([string]$packageVersion) { } function InitializeXCopyMSBuild([string]$packageVersion, [bool]$install) { - $packageName = 'RoslynTools.MSBuild' + $packageName = 'Microsoft.DotNet.Arcade.MSBuild.Xcopy' $packageDir = Join-Path $ToolsDir "msbuild\$packageVersion" $packagePath = Join-Path $packageDir "$packageName.$packageVersion.nupkg" diff --git a/global.json b/global.json index 75ae5dc037e..a658ae62e0a 100644 --- a/global.json +++ b/global.json @@ -31,7 +31,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24102.4", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24102.4" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24105.3", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24105.3" } } From 44fbfc9b6034dd131a929fdd7a10641d407c2c43 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 9 Feb 2024 15:23:10 +0000 Subject: [PATCH 050/568] [feature/9.x] Update dependencies from dotnet/arcade (#6002) [feature/9.x] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- global.json | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 110d8e42c39..9ab758ed9a8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,29 +22,29 @@ https://github.com/dotnet/roslyn-analyzers bf54e2bebc28004dec0311dc4083bcff4fd44cdb - + https://github.com/dotnet/arcade - 8cfc9489d3e51071fedec9dcb99071dc912718bd + f7eb7794c703dc29a83b414b786e9a154f0ca042 - + https://github.com/dotnet/arcade - 8cfc9489d3e51071fedec9dcb99071dc912718bd + f7eb7794c703dc29a83b414b786e9a154f0ca042 - + https://github.com/dotnet/arcade - 8cfc9489d3e51071fedec9dcb99071dc912718bd + f7eb7794c703dc29a83b414b786e9a154f0ca042 - + https://github.com/dotnet/arcade - 8cfc9489d3e51071fedec9dcb99071dc912718bd + f7eb7794c703dc29a83b414b786e9a154f0ca042 https://github.com/dotnet/installer 103ff6d4866ae1feff84a1865df0c1a7494ceffc - + https://github.com/dotnet/arcade - 8cfc9489d3e51071fedec9dcb99071dc912718bd + f7eb7794c703dc29a83b414b786e9a154f0ca042 https://github.com/dotnet/symstore diff --git a/eng/Versions.props b/eng/Versions.props index 10dee6b35d5..f034e195a62 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,9 +53,9 @@ --> - 9.0.0-beta.24105.3 - 9.0.0-beta.24105.3 - 9.0.0-beta.24105.3 + 9.0.0-beta.24106.2 + 9.0.0-beta.24106.2 + 9.0.0-beta.24106.2 9.0.0-preview.1.24081.5 9.0.0-preview.1.24081.5 diff --git a/global.json b/global.json index a658ae62e0a..778c3239044 100644 --- a/global.json +++ b/global.json @@ -31,7 +31,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24105.3", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24105.3" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24106.2", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24106.2" } } From 66629dec8c94e899fa14a6155c24db8d80eea008 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 9 Feb 2024 09:32:49 -0800 Subject: [PATCH 051/568] [feature/9.x] Update dependencies from dotnet/diagnostics (#6001) * Update dependencies from https://github.com/dotnet/diagnostics build 20240207.1 Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe From Version 8.0.0-preview.24105.2 -> To Version 8.0.0-preview.24107.1 * Update dependencies from https://github.com/dotnet/diagnostics build 20240208.1 Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe From Version 8.0.0-preview.24105.2 -> To Version 8.0.0-preview.24108.1 --------- Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9ab758ed9a8..22ed2e458bb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore b1beadfe0ad3d02eb5207681a5328793c4b3822c - + https://github.com/dotnet/diagnostics - 47652575bc89e980d85a9f142a41352ffc391788 + 6011f2e05c90f928dffbb5c526e28b8a751d44bc - + https://github.com/dotnet/diagnostics - 47652575bc89e980d85a9f142a41352ffc391788 + 6011f2e05c90f928dffbb5c526e28b8a751d44bc https://github.com/dotnet/command-line-api diff --git a/eng/Versions.props b/eng/Versions.props index f034e195a62..4a23770c401 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -62,8 +62,8 @@ 2.0.0-beta4.24102.1 - 8.0.0-preview.24105.2 - 8.0.0-preview.24105.2 + 8.0.0-preview.24108.1 + 8.0.0-preview.24108.1 9.0.100-preview.1.24101.4 From 9f2461fd2745b72a9f3c13999358cacef9ff52c5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 10 Feb 2024 14:30:47 +0000 Subject: [PATCH 052/568] Update dependencies from https://github.com/dotnet/diagnostics build 20240209.1 (#6009) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 22ed2e458bb..fe332ebdeb5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore b1beadfe0ad3d02eb5207681a5328793c4b3822c - + https://github.com/dotnet/diagnostics - 6011f2e05c90f928dffbb5c526e28b8a751d44bc + b190e56e28d67e4d5eb7848e705cb1d5e2bcae17 - + https://github.com/dotnet/diagnostics - 6011f2e05c90f928dffbb5c526e28b8a751d44bc + b190e56e28d67e4d5eb7848e705cb1d5e2bcae17 https://github.com/dotnet/command-line-api diff --git a/eng/Versions.props b/eng/Versions.props index 4a23770c401..38a6f489fd5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -62,8 +62,8 @@ 2.0.0-beta4.24102.1 - 8.0.0-preview.24108.1 - 8.0.0-preview.24108.1 + 8.0.0-preview.24109.1 + 8.0.0-preview.24109.1 9.0.100-preview.1.24101.4 From 9c8f17e1470d9f8171c624f667408a39f7ebfe59 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 13 Feb 2024 14:48:41 +0000 Subject: [PATCH 053/568] Update dependencies from https://github.com/dotnet/command-line-api build 20240212.1 (#6019) [feature/9.x] Update dependencies from dotnet/command-line-api --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fe332ebdeb5..90141e27cc1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -12,9 +12,9 @@ https://github.com/dotnet/diagnostics b190e56e28d67e4d5eb7848e705cb1d5e2bcae17 - + https://github.com/dotnet/command-line-api - 46fea71e3d98dad0d676950522004b7f295dd372 + e9ac4ff4293cf853f3d07eb9e747aef27f5be965 diff --git a/eng/Versions.props b/eng/Versions.props index 38a6f489fd5..d02ee5a25da 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -60,7 +60,7 @@ 9.0.0-preview.1.24081.5 9.0.0-preview.1.24081.5 - 2.0.0-beta4.24102.1 + 2.0.0-beta4.24112.1 8.0.0-preview.24109.1 8.0.0-preview.24109.1 From e79105c589a7719a38b94352989a1a6118a32dea Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 13 Feb 2024 14:51:31 +0000 Subject: [PATCH 054/568] Update dependencies from https://github.com/dotnet/diagnostics build 20240212.1 (#6018) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 90141e27cc1..38277c7e97f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore b1beadfe0ad3d02eb5207681a5328793c4b3822c - + https://github.com/dotnet/diagnostics - b190e56e28d67e4d5eb7848e705cb1d5e2bcae17 + 85d0d3980355859d0088388fbd4a7749f7e46c21 - + https://github.com/dotnet/diagnostics - b190e56e28d67e4d5eb7848e705cb1d5e2bcae17 + 85d0d3980355859d0088388fbd4a7749f7e46c21 https://github.com/dotnet/command-line-api diff --git a/eng/Versions.props b/eng/Versions.props index d02ee5a25da..39adba95853 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -62,8 +62,8 @@ 2.0.0-beta4.24112.1 - 8.0.0-preview.24109.1 - 8.0.0-preview.24109.1 + 8.0.0-preview.24112.1 + 8.0.0-preview.24112.1 9.0.100-preview.1.24101.4 From e42eca934c464bafe8238471e348139918c42e3d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 15 Feb 2024 15:12:44 +0000 Subject: [PATCH 055/568] [feature/9.x] Update dependencies from dotnet/arcade (#6026) [feature/9.x] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 +++++++++---------- eng/Versions.props | 6 +++--- eng/common/post-build/publish-using-darc.ps1 | 4 ++-- .../templates/job/publish-build-assets.yml | 16 +++++++-------- .../templates/post-build/post-build.yml | 16 +++++++-------- eng/common/templates/steps/send-to-helix.yml | 6 ++++-- .../templates/variables/pool-providers.yml | 12 +++++------ global.json | 4 ++-- 8 files changed, 43 insertions(+), 41 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 38277c7e97f..e95464dfe31 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,29 +22,29 @@ https://github.com/dotnet/roslyn-analyzers bf54e2bebc28004dec0311dc4083bcff4fd44cdb - + https://github.com/dotnet/arcade - f7eb7794c703dc29a83b414b786e9a154f0ca042 + c3f5cbfb2829795294f5c2d9fa5a0522f47e91fb - + https://github.com/dotnet/arcade - f7eb7794c703dc29a83b414b786e9a154f0ca042 + c3f5cbfb2829795294f5c2d9fa5a0522f47e91fb - + https://github.com/dotnet/arcade - f7eb7794c703dc29a83b414b786e9a154f0ca042 + c3f5cbfb2829795294f5c2d9fa5a0522f47e91fb - + https://github.com/dotnet/arcade - f7eb7794c703dc29a83b414b786e9a154f0ca042 + c3f5cbfb2829795294f5c2d9fa5a0522f47e91fb https://github.com/dotnet/installer 103ff6d4866ae1feff84a1865df0c1a7494ceffc - + https://github.com/dotnet/arcade - f7eb7794c703dc29a83b414b786e9a154f0ca042 + c3f5cbfb2829795294f5c2d9fa5a0522f47e91fb https://github.com/dotnet/symstore diff --git a/eng/Versions.props b/eng/Versions.props index 39adba95853..1dc70b35617 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,9 +53,9 @@ --> - 9.0.0-beta.24106.2 - 9.0.0-beta.24106.2 - 9.0.0-beta.24106.2 + 9.0.0-beta.24112.1 + 9.0.0-beta.24112.1 + 9.0.0-beta.24112.1 9.0.0-preview.1.24081.5 9.0.0-preview.1.24081.5 diff --git a/eng/common/post-build/publish-using-darc.ps1 b/eng/common/post-build/publish-using-darc.ps1 index 1e779fec4dd..5a3a32ea8d7 100644 --- a/eng/common/post-build/publish-using-darc.ps1 +++ b/eng/common/post-build/publish-using-darc.ps1 @@ -12,7 +12,7 @@ param( try { . $PSScriptRoot\post-build-utils.ps1 - $darc = Get-Darc + $darc = Get-Darc $optionalParams = [System.Collections.ArrayList]::new() @@ -46,7 +46,7 @@ try { } Write-Host 'done.' -} +} catch { Write-Host $_ Write-PipelineTelemetryError -Category 'PromoteBuild' -Message "There was an error while trying to publish build '$BuildId' to default channels." diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml index 3115990d511..bb42240f865 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -58,7 +58,7 @@ jobs: demands: Cmd # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: - name: $(DncEngInternalBuildPool) + name: NetCore1ESPool-Publishing-Internal demands: ImageOverride -equals windows.vs2019.amd64 steps: @@ -66,7 +66,7 @@ jobs: - checkout: self fetchDepth: 3 clean: true - + - task: DownloadBuildArtifacts@0 displayName: Download artifact inputs: @@ -75,7 +75,7 @@ jobs: checkDownloadedFiles: true condition: ${{ parameters.condition }} continueOnError: ${{ parameters.continueOnError }} - + - task: NuGetAuthenticate@1 - task: PowerShell@2 @@ -90,7 +90,7 @@ jobs: /p:OfficialBuildId=$(Build.BuildNumber) condition: ${{ parameters.condition }} continueOnError: ${{ parameters.continueOnError }} - + - task: powershell@2 displayName: Create ReleaseConfigs Artifact inputs: @@ -99,7 +99,7 @@ jobs: Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value $(BARBuildId) Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value "$(DefaultChannels)" Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value $(IsStableBuild) - + - task: PublishBuildArtifacts@1 displayName: Publish ReleaseConfigs Artifact inputs: @@ -125,7 +125,7 @@ jobs: - task: PublishBuildArtifacts@1 displayName: Publish SymbolPublishingExclusionsFile Artifact - condition: eq(variables['SymbolExclusionFile'], 'true') + condition: eq(variables['SymbolExclusionFile'], 'true') inputs: PathtoPublish: '$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' PublishLocation: Container @@ -141,7 +141,7 @@ jobs: displayName: Publish Using Darc inputs: filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 - arguments: -BuildId $(BARBuildId) + arguments: -BuildId $(BARBuildId) -PublishingInfraVersion 3 -AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)' -MaestroToken '$(MaestroApiAccessToken)' @@ -152,4 +152,4 @@ jobs: - ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}: - template: /eng/common/templates/steps/publish-logs.yml parameters: - JobLabel: 'Publish_Artifacts_Logs' + JobLabel: 'Publish_Artifacts_Logs' diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index bbc010fe732..ee70e2b399c 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -39,7 +39,7 @@ parameters: displayName: Enable NuGet validation type: boolean default: true - + - name: publishInstallersAndChecksums displayName: Publish installers and checksums type: boolean @@ -131,8 +131,8 @@ stages: displayName: Validate inputs: filePath: $(Build.SourcesDirectory)/eng/common/post-build/nuget-validation.ps1 - arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ - -ToolDestinationPath $(Agent.BuildDirectory)/Extract/ + arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ + -ToolDestinationPath $(Agent.BuildDirectory)/Extract/ - job: displayName: Signing Validation @@ -222,9 +222,9 @@ stages: displayName: Validate inputs: filePath: $(Build.SourcesDirectory)/eng/common/post-build/sourcelink-validation.ps1 - arguments: -InputPath $(Build.ArtifactStagingDirectory)/BlobArtifacts/ - -ExtractPath $(Agent.BuildDirectory)/Extract/ - -GHRepoName $(Build.Repository.Name) + arguments: -InputPath $(Build.ArtifactStagingDirectory)/BlobArtifacts/ + -ExtractPath $(Agent.BuildDirectory)/Extract/ + -GHRepoName $(Build.Repository.Name) -GHCommit $(Build.SourceVersion) -SourcelinkCliVersion $(SourceLinkCLIVersion) continueOnError: true @@ -259,7 +259,7 @@ stages: demands: Cmd # If it's not devdiv, it's dnceng ${{ else }}: - name: $(DncEngInternalBuildPool) + name: NetCore1ESPool-Publishing-Internal demands: ImageOverride -equals windows.vs2019.amd64 steps: - template: setup-maestro-vars.yml @@ -273,7 +273,7 @@ stages: displayName: Publish Using Darc inputs: filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 - arguments: -BuildId $(BARBuildId) + arguments: -BuildId $(BARBuildId) -PublishingInfraVersion ${{ parameters.publishingInfraVersion }} -AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)' -MaestroToken '$(MaestroApiAccessToken)' diff --git a/eng/common/templates/steps/send-to-helix.yml b/eng/common/templates/steps/send-to-helix.yml index 3eb7e2d5f84..68fa739c4ab 100644 --- a/eng/common/templates/steps/send-to-helix.yml +++ b/eng/common/templates/steps/send-to-helix.yml @@ -5,6 +5,8 @@ parameters: HelixBuild: $(Build.BuildNumber) # required -- the build number Helix will use to identify this -- automatically set to the AzDO build number HelixTargetQueues: '' # required -- semicolon-delimited list of Helix queues to test on; see https://helix.dot.net/ for a list of queues HelixAccessToken: '' # required -- access token to make Helix API requests; should be provided by the appropriate variable group + HelixProjectPath: 'eng/common/helixpublish.proj' # optional -- path to the project file to build relative to BUILD_SOURCESDIRECTORY + HelixProjectArguments: '' # optional -- arguments passed to the build command HelixConfiguration: '' # optional -- additional property attached to a job HelixPreCommands: '' # optional -- commands to run before Helix work item execution HelixPostCommands: '' # optional -- commands to run after Helix work item execution @@ -29,7 +31,7 @@ parameters: continueOnError: false # optional -- determines whether to continue the build if the step errors; defaults to false steps: - - powershell: 'powershell "$env:BUILD_SOURCESDIRECTORY\eng\common\msbuild.ps1 $env:BUILD_SOURCESDIRECTORY\eng\common\helixpublish.proj /restore /p:TreatWarningsAsErrors=false /t:Test /bl:$env:BUILD_SOURCESDIRECTORY\artifacts\log\$env:BuildConfig\SendToHelix.binlog"' + - powershell: 'powershell "$env:BUILD_SOURCESDIRECTORY\eng\common\msbuild.ps1 $env:BUILD_SOURCESDIRECTORY/${{ parameters.HelixProjectPath }} /restore /p:TreatWarningsAsErrors=false ${{ parameters.HelixProjectArguments }} /t:Test /bl:$env:BUILD_SOURCESDIRECTORY\artifacts\log\$env:BuildConfig\SendToHelix.binlog"' displayName: ${{ parameters.DisplayNamePrefix }} (Windows) env: BuildConfig: $(_BuildConfig) @@ -59,7 +61,7 @@ steps: SYSTEM_ACCESSTOKEN: $(System.AccessToken) condition: and(${{ parameters.condition }}, eq(variables['Agent.Os'], 'Windows_NT')) continueOnError: ${{ parameters.continueOnError }} - - script: $BUILD_SOURCESDIRECTORY/eng/common/msbuild.sh $BUILD_SOURCESDIRECTORY/eng/common/helixpublish.proj /restore /p:TreatWarningsAsErrors=false /t:Test /bl:$BUILD_SOURCESDIRECTORY/artifacts/log/$BuildConfig/SendToHelix.binlog + - script: $BUILD_SOURCESDIRECTORY/eng/common/msbuild.sh $BUILD_SOURCESDIRECTORY/${{ parameters.HelixProjectPath }} /restore /p:TreatWarningsAsErrors=false ${{ parameters.HelixProjectArguments }} /t:Test /bl:$BUILD_SOURCESDIRECTORY/artifacts/log/$BuildConfig/SendToHelix.binlog displayName: ${{ parameters.DisplayNamePrefix }} (Unix) env: BuildConfig: $(_BuildConfig) diff --git a/eng/common/templates/variables/pool-providers.yml b/eng/common/templates/variables/pool-providers.yml index 9cc5c550d3b..d236f9fdbb1 100644 --- a/eng/common/templates/variables/pool-providers.yml +++ b/eng/common/templates/variables/pool-providers.yml @@ -1,15 +1,15 @@ -# Select a pool provider based off branch name. Anything with branch name containing 'release' must go into an -Svc pool, +# Select a pool provider based off branch name. Anything with branch name containing 'release' must go into an -Svc pool, # otherwise it should go into the "normal" pools. This separates out the queueing and billing of released branches. -# Motivation: +# Motivation: # Once a given branch of a repository's output has been officially "shipped" once, it is then considered to be COGS # (Cost of goods sold) and should be moved to a servicing pool provider. This allows both separation of queueing # (allowing release builds and main PR builds to not intefere with each other) and billing (required for COGS. -# Additionally, the pool provider name itself may be subject to change when the .NET Core Engineering Services -# team needs to move resources around and create new and potentially differently-named pools. Using this template +# Additionally, the pool provider name itself may be subject to change when the .NET Core Engineering Services +# team needs to move resources around and create new and potentially differently-named pools. Using this template # file from an Arcade-ified repo helps guard against both having to update one's release/* branches and renaming. -# How to use: +# How to use: # This yaml assumes your shipped product branches use the naming convention "release/..." (which many do). # If we find alternate naming conventions in broad usage it can be added to the condition below. # @@ -54,4 +54,4 @@ variables: False, 'NetCore1ESPool-Internal' ) - ] \ No newline at end of file + ] diff --git a/global.json b/global.json index 778c3239044..4923a85b805 100644 --- a/global.json +++ b/global.json @@ -31,7 +31,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24106.2", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24106.2" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24112.1", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24112.1" } } From 6cf373c5f93cfde0760cd3ff61ffc254414fc487 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 16 Feb 2024 16:11:15 +0000 Subject: [PATCH 056/568] Update dependencies from https://github.com/dotnet/arcade build 20240214.1 (#6040) [feature/9.x] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- global.json | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e95464dfe31..4d3bf1f0276 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,29 +22,29 @@ https://github.com/dotnet/roslyn-analyzers bf54e2bebc28004dec0311dc4083bcff4fd44cdb - + https://github.com/dotnet/arcade - c3f5cbfb2829795294f5c2d9fa5a0522f47e91fb + d5b02a4900c4d521cb48b8f0d7e3f28175268f7c - + https://github.com/dotnet/arcade - c3f5cbfb2829795294f5c2d9fa5a0522f47e91fb + d5b02a4900c4d521cb48b8f0d7e3f28175268f7c - + https://github.com/dotnet/arcade - c3f5cbfb2829795294f5c2d9fa5a0522f47e91fb + d5b02a4900c4d521cb48b8f0d7e3f28175268f7c - + https://github.com/dotnet/arcade - c3f5cbfb2829795294f5c2d9fa5a0522f47e91fb + d5b02a4900c4d521cb48b8f0d7e3f28175268f7c https://github.com/dotnet/installer 103ff6d4866ae1feff84a1865df0c1a7494ceffc - + https://github.com/dotnet/arcade - c3f5cbfb2829795294f5c2d9fa5a0522f47e91fb + d5b02a4900c4d521cb48b8f0d7e3f28175268f7c https://github.com/dotnet/symstore diff --git a/eng/Versions.props b/eng/Versions.props index 1dc70b35617..e8d1129ecba 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,9 +53,9 @@ --> - 9.0.0-beta.24112.1 - 9.0.0-beta.24112.1 - 9.0.0-beta.24112.1 + 9.0.0-beta.24114.1 + 9.0.0-beta.24114.1 + 9.0.0-beta.24114.1 9.0.0-preview.1.24081.5 9.0.0-preview.1.24081.5 diff --git a/global.json b/global.json index 4923a85b805..908cf4bae46 100644 --- a/global.json +++ b/global.json @@ -31,7 +31,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24112.1", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24112.1" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24114.1", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24114.1" } } From a0ed6828f9e18a72ad500eb77413502c101fc866 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 20 Feb 2024 14:05:08 -0800 Subject: [PATCH 057/568] [feature/9.x] Update dependencies from dotnet/installer (#6033) * Update dependencies from https://github.com/dotnet/installer build 20240215.9 Microsoft.Dotnet.Sdk.Internal From Version 9.0.100-preview.1.24101.4 -> To Version 9.0.100-preview.2.24115.9 Dependency coherency updates Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0 From Version 9.0.0-preview.1.24081.5 -> To Version 9.0.0-preview.2.24114.9 (parent: Microsoft.Dotnet.Sdk.Internal * Update dependencies from https://github.com/dotnet/installer build 20240216.1 Microsoft.Dotnet.Sdk.Internal From Version 9.0.100-preview.1.24101.4 -> To Version 9.0.100-preview.2.24116.1 Dependency coherency updates Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0 From Version 9.0.0-preview.1.24081.5 -> To Version 9.0.0-preview.2.24114.9 (parent: Microsoft.Dotnet.Sdk.Internal * Update dependencies from https://github.com/dotnet/installer build 20240216.21 Microsoft.Dotnet.Sdk.Internal From Version 9.0.100-preview.1.24101.4 -> To Version 9.0.100-preview.2.24116.21 Dependency coherency updates Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0 From Version 9.0.0-preview.1.24081.5 -> To Version 9.0.0-preview.2.24114.9 (parent: Microsoft.Dotnet.Sdk.Internal * Update dependencies from https://github.com/dotnet/installer build 20240216.21 Microsoft.Dotnet.Sdk.Internal From Version 9.0.100-preview.1.24101.4 -> To Version 9.0.100-preview.2.24116.21 Dependency coherency updates Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0 From Version 9.0.0-preview.1.24081.5 -> To Version 9.0.0-preview.2.24114.9 (parent: Microsoft.Dotnet.Sdk.Internal * Update dependencies from https://github.com/dotnet/installer build 20240216.21 Microsoft.Dotnet.Sdk.Internal From Version 9.0.100-preview.1.24101.4 -> To Version 9.0.100-preview.2.24116.21 Dependency coherency updates Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0 From Version 9.0.0-preview.1.24081.5 -> To Version 9.0.0-preview.2.24114.9 (parent: Microsoft.Dotnet.Sdk.Internal * Update dependencies from https://github.com/dotnet/installer build 20240219.3 Microsoft.Dotnet.Sdk.Internal From Version 9.0.100-preview.1.24101.4 -> To Version 9.0.100-preview.2.24119.3 Dependency coherency updates Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0 From Version 9.0.0-preview.1.24081.5 -> To Version 9.0.0-preview.2.24114.9 (parent: Microsoft.Dotnet.Sdk.Internal --------- Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4d3bf1f0276..1f2a9da6154 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/aspnetcore - b1beadfe0ad3d02eb5207681a5328793c4b3822c + 4ea9f39a3447596ed9bf42320882cc6423e0c60b https://github.com/dotnet/diagnostics @@ -38,9 +38,9 @@ https://github.com/dotnet/arcade d5b02a4900c4d521cb48b8f0d7e3f28175268f7c - + https://github.com/dotnet/installer - 103ff6d4866ae1feff84a1865df0c1a7494ceffc + 709259d8084d7aef80259be1f0ffa7d76923fcfa https://github.com/dotnet/arcade @@ -50,17 +50,17 @@ https://github.com/dotnet/symstore 36d076932232b23c4e2de271e894b23a16c34ef6 - + https://github.com/dotnet/runtime - 1d1bf92fcf43aa6981804dc53c5174445069c9e4 + 963626276e11bf5587aaed69826b62682b05d9c4 - + https://github.com/dotnet/aspnetcore - b1beadfe0ad3d02eb5207681a5328793c4b3822c + 4ea9f39a3447596ed9bf42320882cc6423e0c60b - + https://github.com/dotnet/runtime - 1d1bf92fcf43aa6981804dc53c5174445069c9e4 + 963626276e11bf5587aaed69826b62682b05d9c4 diff --git a/eng/Versions.props b/eng/Versions.props index e8d1129ecba..8aefb71bf51 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,20 +57,20 @@ 9.0.0-beta.24114.1 9.0.0-beta.24114.1 - 9.0.0-preview.1.24081.5 - 9.0.0-preview.1.24081.5 + 9.0.0-preview.2.24114.9 + 9.0.0-preview.2.24114.9 2.0.0-beta4.24112.1 8.0.0-preview.24112.1 8.0.0-preview.24112.1 - 9.0.100-preview.1.24101.4 + 9.0.100-preview.2.24119.3 9.0.0-preview.24075.1 - 9.0.0-preview.1.24080.9 - 9.0.0-preview.1.24080.9 + 9.0.0-preview.2.24115.1 + 9.0.0-preview.2.24115.1 1.0.510501 From 80d63365c328c9c08d786edbb9ce5c24add57c2f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 20 Feb 2024 14:07:38 -0800 Subject: [PATCH 058/568] [feature/9.x] Update dependencies from dotnet/diagnostics (#6042) * Update dependencies from https://github.com/dotnet/diagnostics build 20240216.1 Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe From Version 8.0.0-preview.24112.1 -> To Version 8.0.0-preview.24116.1 * Update dependencies from https://github.com/dotnet/diagnostics build 20240216.1 Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe From Version 8.0.0-preview.24112.1 -> To Version 8.0.0-preview.24116.1 * Update dependencies from https://github.com/dotnet/diagnostics build 20240216.1 Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe From Version 8.0.0-preview.24112.1 -> To Version 8.0.0-preview.24116.1 * Update dependencies from https://github.com/dotnet/diagnostics build 20240219.1 Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe From Version 8.0.0-preview.24112.1 -> To Version 8.0.0-preview.24119.1 --------- Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1f2a9da6154..b5d13239c61 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore 4ea9f39a3447596ed9bf42320882cc6423e0c60b - + https://github.com/dotnet/diagnostics - 85d0d3980355859d0088388fbd4a7749f7e46c21 + 175b855911918ff88e1503085689bbd1482f6103 - + https://github.com/dotnet/diagnostics - 85d0d3980355859d0088388fbd4a7749f7e46c21 + 175b855911918ff88e1503085689bbd1482f6103 https://github.com/dotnet/command-line-api diff --git a/eng/Versions.props b/eng/Versions.props index 8aefb71bf51..b05b4285ee8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -62,8 +62,8 @@ 2.0.0-beta4.24112.1 - 8.0.0-preview.24112.1 - 8.0.0-preview.24112.1 + 8.0.0-preview.24119.1 + 8.0.0-preview.24119.1 9.0.100-preview.2.24119.3 From f33f3c02709e1dbbd1faf27feeb8cf778c191265 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 20 Feb 2024 14:50:30 -0800 Subject: [PATCH 059/568] [feature/9.x] Update dependencies from dotnet/symstore (#6021) * Update dependencies from https://github.com/dotnet/symstore build 20240212.1 Microsoft.FileFormats From Version 1.0.510501 -> To Version 1.0.511201 * Update dependencies from https://github.com/dotnet/symstore build 20240212.1 Microsoft.FileFormats From Version 1.0.510501 -> To Version 1.0.511201 * Update dependencies from https://github.com/dotnet/symstore build 20240212.1 Microsoft.FileFormats From Version 1.0.510501 -> To Version 1.0.511201 * Update dependencies from https://github.com/dotnet/symstore build 20240212.1 Microsoft.FileFormats From Version 1.0.510501 -> To Version 1.0.511201 * Update dependencies from https://github.com/dotnet/symstore build 20240212.1 Microsoft.FileFormats From Version 1.0.510501 -> To Version 1.0.511201 * Update dependencies from https://github.com/dotnet/symstore build 20240212.1 Microsoft.FileFormats From Version 1.0.510501 -> To Version 1.0.511201 * Update dependencies from https://github.com/dotnet/symstore build 20240212.1 Microsoft.FileFormats From Version 1.0.510501 -> To Version 1.0.511201 * Update dependencies from https://github.com/dotnet/symstore build 20240219.1 Microsoft.FileFormats From Version 1.0.510501 -> To Version 1.0.511901 --------- Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b5d13239c61..86c0e302a9b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -46,9 +46,9 @@ https://github.com/dotnet/arcade d5b02a4900c4d521cb48b8f0d7e3f28175268f7c - + https://github.com/dotnet/symstore - 36d076932232b23c4e2de271e894b23a16c34ef6 + 96a152a28e86ecc5c68ec9a73e02bb1e93163338 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index b05b4285ee8..db7c475e22b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -72,7 +72,7 @@ 9.0.0-preview.2.24115.1 9.0.0-preview.2.24115.1 - 1.0.510501 + 1.0.511901 $(MicrosoftNETCoreApp31Version) From 9b5b2a4223b929f9ddd621c630fec0c5d626f964 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 20 Feb 2024 23:06:01 +0000 Subject: [PATCH 060/568] [feature/9.x] Update dependencies from dotnet/roslyn-analyzers (#6034) * Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20240209.1 Microsoft.CodeAnalysis.NetAnalyzers From Version 9.0.0-preview.24075.1 -> To Version 9.0.0-preview.24109.1 * Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20240215.1 Microsoft.CodeAnalysis.NetAnalyzers From Version 9.0.0-preview.24075.1 -> To Version 9.0.0-preview.24115.1 * Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20240216.1 Microsoft.CodeAnalysis.NetAnalyzers From Version 9.0.0-preview.24075.1 -> To Version 9.0.0-preview.24116.1 * Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20240217.1 Microsoft.CodeAnalysis.NetAnalyzers From Version 9.0.0-preview.24075.1 -> To Version 9.0.0-preview.24117.1 * Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20240217.1 Microsoft.CodeAnalysis.NetAnalyzers From Version 9.0.0-preview.24075.1 -> To Version 9.0.0-preview.24117.1 * Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20240217.1 Microsoft.CodeAnalysis.NetAnalyzers From Version 9.0.0-preview.24075.1 -> To Version 9.0.0-preview.24117.1 --------- Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 86c0e302a9b..bb0880ac2b9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -18,9 +18,9 @@ - + https://github.com/dotnet/roslyn-analyzers - bf54e2bebc28004dec0311dc4083bcff4fd44cdb + ab13ac75d1195a27e3cf7fb990fc3a51615caa95 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index db7c475e22b..dec445fe853 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -67,7 +67,7 @@ 9.0.100-preview.2.24119.3 - 9.0.0-preview.24075.1 + 9.0.0-preview.24117.1 9.0.0-preview.2.24115.1 9.0.0-preview.2.24115.1 From c1052c6a4e698a421a687e4389eab62768167ed4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 22 Feb 2024 08:55:10 -0800 Subject: [PATCH 061/568] Update dependencies from https://github.com/dotnet/diagnostics build 20240220.1 (#6068) Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe From Version 8.0.0-preview.24119.1 -> To Version 8.0.0-preview.24120.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bb0880ac2b9..98fb8a8e52d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore 4ea9f39a3447596ed9bf42320882cc6423e0c60b - + https://github.com/dotnet/diagnostics - 175b855911918ff88e1503085689bbd1482f6103 + d498654de4bf01e02ec689a51923e8c18b9c8d9c - + https://github.com/dotnet/diagnostics - 175b855911918ff88e1503085689bbd1482f6103 + d498654de4bf01e02ec689a51923e8c18b9c8d9c https://github.com/dotnet/command-line-api diff --git a/eng/Versions.props b/eng/Versions.props index dec445fe853..c59441027bd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -62,8 +62,8 @@ 2.0.0-beta4.24112.1 - 8.0.0-preview.24119.1 - 8.0.0-preview.24119.1 + 8.0.0-preview.24121.1 + 8.0.0-preview.24121.1 9.0.100-preview.2.24119.3 From 58bcf9c44429a42f78732dc36b0649dd70f395f4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 22 Feb 2024 08:55:33 -0800 Subject: [PATCH 062/568] [feature/9.x] Update dependencies from dotnet/installer (#6069) * Update dependencies from https://github.com/dotnet/installer build 20240221.2 Microsoft.Dotnet.Sdk.Internal From Version 9.0.100-preview.2.24119.3 -> To Version 9.0.100-preview.2.24121.2 Dependency coherency updates Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0 From Version 9.0.0-preview.2.24114.9 -> To Version 9.0.0-preview.2.24120.6 (parent: Microsoft.Dotnet.Sdk.Internal * Update dependencies from https://github.com/dotnet/installer build 20240222.2 Microsoft.Dotnet.Sdk.Internal From Version 9.0.100-preview.2.24119.3 -> To Version 9.0.100-preview.2.24122.2 Dependency coherency updates Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0 From Version 9.0.0-preview.2.24114.9 -> To Version 9.0.0-preview.2.24120.6 (parent: Microsoft.Dotnet.Sdk.Internal --------- Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 98fb8a8e52d..e50fe03bf8f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/aspnetcore - 4ea9f39a3447596ed9bf42320882cc6423e0c60b + f26b79eb34d13648bedc5ec98e2151f8c55db978 https://github.com/dotnet/diagnostics @@ -38,9 +38,9 @@ https://github.com/dotnet/arcade d5b02a4900c4d521cb48b8f0d7e3f28175268f7c - + https://github.com/dotnet/installer - 709259d8084d7aef80259be1f0ffa7d76923fcfa + b271530f9cc2c8c0f8dd12d57ffa9cd5255b7fe4 https://github.com/dotnet/arcade @@ -50,17 +50,17 @@ https://github.com/dotnet/symstore 96a152a28e86ecc5c68ec9a73e02bb1e93163338 - + https://github.com/dotnet/runtime - 963626276e11bf5587aaed69826b62682b05d9c4 + 1b1d26ac74e374309fb101382026ba0480d3821d - + https://github.com/dotnet/aspnetcore - 4ea9f39a3447596ed9bf42320882cc6423e0c60b + f26b79eb34d13648bedc5ec98e2151f8c55db978 - + https://github.com/dotnet/runtime - 963626276e11bf5587aaed69826b62682b05d9c4 + 1b1d26ac74e374309fb101382026ba0480d3821d diff --git a/eng/Versions.props b/eng/Versions.props index c59441027bd..a7d6a7659db 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,20 +57,20 @@ 9.0.0-beta.24114.1 9.0.0-beta.24114.1 - 9.0.0-preview.2.24114.9 - 9.0.0-preview.2.24114.9 + 9.0.0-preview.2.24120.6 + 9.0.0-preview.2.24120.6 2.0.0-beta4.24112.1 8.0.0-preview.24121.1 8.0.0-preview.24121.1 - 9.0.100-preview.2.24119.3 + 9.0.100-preview.2.24122.2 9.0.0-preview.24117.1 - 9.0.0-preview.2.24115.1 - 9.0.0-preview.2.24115.1 + 9.0.0-preview.2.24120.11 + 9.0.0-preview.2.24120.11 1.0.511901 From f1f49b605c6cca8515f713db4e7518a38e78bf1b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 22 Feb 2024 11:55:30 -0800 Subject: [PATCH 063/568] Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20240221.1 (#6076) Microsoft.CodeAnalysis.NetAnalyzers From Version 9.0.0-preview.24117.1 -> To Version 9.0.0-preview.24121.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e50fe03bf8f..ffca66fc952 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -18,9 +18,9 @@ - + https://github.com/dotnet/roslyn-analyzers - ab13ac75d1195a27e3cf7fb990fc3a51615caa95 + 4195460a822168a75aa3d31b4a8d0fa88c42855c https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index a7d6a7659db..09015d3e3ea 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -67,7 +67,7 @@ 9.0.100-preview.2.24122.2 - 9.0.0-preview.24117.1 + 9.0.0-preview.24121.1 9.0.0-preview.2.24120.11 9.0.0-preview.2.24120.11 From 044f827aad717939cd12da13f17f78907f1b6356 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 23 Feb 2024 17:41:31 +0000 Subject: [PATCH 064/568] Update dependencies from https://github.com/dotnet/diagnostics build 20240222.1 (#6101) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ffca66fc952..6761086a0da 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,11 +4,11 @@ https://github.com/dotnet/aspnetcore f26b79eb34d13648bedc5ec98e2151f8c55db978 - + https://github.com/dotnet/diagnostics d498654de4bf01e02ec689a51923e8c18b9c8d9c - + https://github.com/dotnet/diagnostics d498654de4bf01e02ec689a51923e8c18b9c8d9c diff --git a/eng/Versions.props b/eng/Versions.props index 09015d3e3ea..b81ac06f359 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -62,8 +62,8 @@ 2.0.0-beta4.24112.1 - 8.0.0-preview.24121.1 - 8.0.0-preview.24121.1 + 8.0.0-preview.24122.1 + 8.0.0-preview.24122.1 9.0.100-preview.2.24122.2 From 9d9266d64bd57cc2bf2ff921c12b626aa1718aeb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 23 Feb 2024 09:59:05 -0800 Subject: [PATCH 065/568] Update dependencies from https://github.com/dotnet/installer build 20240222.4 (#6102) Microsoft.Dotnet.Sdk.Internal From Version 9.0.100-preview.2.24122.2 -> To Version 9.0.100-preview.2.24122.4 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6761086a0da..05e2273038c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -38,9 +38,9 @@ https://github.com/dotnet/arcade d5b02a4900c4d521cb48b8f0d7e3f28175268f7c - + https://github.com/dotnet/installer - b271530f9cc2c8c0f8dd12d57ffa9cd5255b7fe4 + ed324e09c77034992ce5af746f37d99dd69580f6 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index b81ac06f359..8a0a01adf28 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,7 +65,7 @@ 8.0.0-preview.24122.1 8.0.0-preview.24122.1 - 9.0.100-preview.2.24122.2 + 9.0.100-preview.2.24122.4 9.0.0-preview.24121.1 From 5e722232cf7e7943a62a92355ea47285a2383dfc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 26 Feb 2024 09:02:17 -0800 Subject: [PATCH 066/568] [feature/9.x] Update dependencies from dotnet/command-line-api (#6109) * Update dependencies from https://github.com/dotnet/command-line-api build 20240223.1 System.CommandLine From Version 2.0.0-beta4.24112.1 -> To Version 2.0.0-beta4.24123.1 * Update dependencies from https://github.com/dotnet/command-line-api build 20240223.1 System.CommandLine From Version 2.0.0-beta4.24112.1 -> To Version 2.0.0-beta4.24123.1 * Update dependencies from https://github.com/dotnet/command-line-api build 20240223.1 System.CommandLine From Version 2.0.0-beta4.24112.1 -> To Version 2.0.0-beta4.24123.1 --------- Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 05e2273038c..99f4d2064a9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -12,9 +12,9 @@ https://github.com/dotnet/diagnostics d498654de4bf01e02ec689a51923e8c18b9c8d9c - + https://github.com/dotnet/command-line-api - e9ac4ff4293cf853f3d07eb9e747aef27f5be965 + 94ef1b035c73904f2240b3b3b0de6c4890dab6d8 diff --git a/eng/Versions.props b/eng/Versions.props index 8a0a01adf28..0abdc6438cf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -60,7 +60,7 @@ 9.0.0-preview.2.24120.6 9.0.0-preview.2.24120.6 - 2.0.0-beta4.24112.1 + 2.0.0-beta4.24123.1 8.0.0-preview.24122.1 8.0.0-preview.24122.1 From 331a2cd665234849d1001fc6b7c46e9972d9759d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 27 Feb 2024 09:20:33 -0800 Subject: [PATCH 067/568] Update dependencies from https://github.com/dotnet/arcade build 20240227.2 (#6126) Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.24114.1 -> To Version 9.0.0-beta.24127.2 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 20 +++---- eng/Versions.props | 6 +- eng/common/native/init-distro-rid.sh | 80 +++++++++++++-------------- eng/common/native/init-os-and-arch.sh | 3 +- eng/common/tools.ps1 | 6 +- eng/common/tools.sh | 6 +- global.json | 6 +- 7 files changed, 66 insertions(+), 61 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 99f4d2064a9..9d7b00fcfd8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,29 +22,29 @@ https://github.com/dotnet/roslyn-analyzers 4195460a822168a75aa3d31b4a8d0fa88c42855c - + https://github.com/dotnet/arcade - d5b02a4900c4d521cb48b8f0d7e3f28175268f7c + d9930e5e9a0069e5b7726c119f614486b8ef438f - + https://github.com/dotnet/arcade - d5b02a4900c4d521cb48b8f0d7e3f28175268f7c + d9930e5e9a0069e5b7726c119f614486b8ef438f - + https://github.com/dotnet/arcade - d5b02a4900c4d521cb48b8f0d7e3f28175268f7c + d9930e5e9a0069e5b7726c119f614486b8ef438f - + https://github.com/dotnet/arcade - d5b02a4900c4d521cb48b8f0d7e3f28175268f7c + d9930e5e9a0069e5b7726c119f614486b8ef438f https://github.com/dotnet/installer ed324e09c77034992ce5af746f37d99dd69580f6 - + https://github.com/dotnet/arcade - d5b02a4900c4d521cb48b8f0d7e3f28175268f7c + d9930e5e9a0069e5b7726c119f614486b8ef438f https://github.com/dotnet/symstore diff --git a/eng/Versions.props b/eng/Versions.props index 0abdc6438cf..98acc0db593 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,9 +53,9 @@ --> - 9.0.0-beta.24114.1 - 9.0.0-beta.24114.1 - 9.0.0-beta.24114.1 + 9.0.0-beta.24127.2 + 9.0.0-beta.24127.2 + 9.0.0-beta.24127.2 9.0.0-preview.2.24120.6 9.0.0-preview.2.24120.6 diff --git a/eng/common/native/init-distro-rid.sh b/eng/common/native/init-distro-rid.sh index de1687b2ccb..5dcbfd700f0 100644 --- a/eng/common/native/init-distro-rid.sh +++ b/eng/common/native/init-distro-rid.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/sh # getNonPortableDistroRid # @@ -11,21 +11,20 @@ # non-portable rid getNonPortableDistroRid() { - local targetOs="$1" - local targetArch="$2" - local rootfsDir="$3" - local nonPortableRid="" + targetOs="$1" + targetArch="$2" + rootfsDir="$3" + nonPortableRid="" if [ "$targetOs" = "linux" ]; then + # shellcheck disable=SC1091 if [ -e "${rootfsDir}/etc/os-release" ]; then - source "${rootfsDir}/etc/os-release" - - if [[ "${ID}" == "rhel" || "${ID}" == "rocky" || "${ID}" == "alpine" ]]; then - # remove the last version digit - VERSION_ID="${VERSION_ID%.*}" + . "${rootfsDir}/etc/os-release" + if [ "${ID}" = "rhel" ] || [ "${ID}" = "rocky" ] || [ "${ID}" = "alpine" ]; then + VERSION_ID="${VERSION_ID%.*}" # Remove the last version digit for these distros fi - if [[ "${VERSION_ID:-}" =~ ^([[:digit:]]|\.)+$ ]]; then + if echo "${VERSION_ID:-}" | grep -qE '^([[:digit:]]|\.)+$'; then nonPortableRid="${ID}.${VERSION_ID}-${targetArch}" else # Rolling release distros either do not set VERSION_ID, set it as blank or @@ -33,45 +32,45 @@ getNonPortableDistroRid() # so omit it here to be consistent with everything else. nonPortableRid="${ID}-${targetArch}" fi - elif [ -e "${rootfsDir}/android_platform" ]; then - source "$rootfsDir"/android_platform + # shellcheck disable=SC1091 + . "${rootfsDir}/android_platform" nonPortableRid="$RID" fi fi if [ "$targetOs" = "freebsd" ]; then - # $rootfsDir can be empty. freebsd-version is shell script and it should always work. - __freebsd_major_version=$($rootfsDir/bin/freebsd-version | { read v; echo "${v%%.*}"; }) + # $rootfsDir can be empty. freebsd-version is a shell script and should always work. + __freebsd_major_version=$("$rootfsDir"/bin/freebsd-version | cut -d'.' -f1) nonPortableRid="freebsd.$__freebsd_major_version-${targetArch}" - elif command -v getprop && getprop ro.product.system.model 2>&1 | grep -qi android; then + elif command -v getprop >/dev/null && getprop ro.product.system.model | grep -qi android; then __android_sdk_version=$(getprop ro.build.version.sdk) nonPortableRid="android.$__android_sdk_version-${targetArch}" elif [ "$targetOs" = "illumos" ]; then __uname_version=$(uname -v) case "$__uname_version" in omnios-*) - __omnios_major_version=$(echo "${__uname_version:8:2}") - nonPortableRid=omnios."$__omnios_major_version"-"$targetArch" - ;; + __omnios_major_version=$(echo "$__uname_version" | cut -c9-10) + nonPortableRid="omnios.$__omnios_major_version-${targetArch}" + ;; joyent_*) - __smartos_major_version=$(echo "${__uname_version:7:4}") - nonPortableRid=smartos."$__smartos_major_version"-"$targetArch" - ;; - illumos_*) - nonPortableRid=openindiana-"$targetArch" - ;; + __smartos_major_version=$(echo "$__uname_version" | cut -c9-10) + nonPortableRid="smartos.$__smartos_major_version-${targetArch}" + ;; + *) + nonPortableRid="illumos-${targetArch}" + ;; esac elif [ "$targetOs" = "solaris" ]; then __uname_version=$(uname -v) - __solaris_major_version=$(echo "${__uname_version%.*}") - nonPortableRid=solaris."$__solaris_major_version"-"$targetArch" + __solaris_major_version=$(echo "$__uname_version" | cut -d'.' -f1) + nonPortableRid="solaris.$__solaris_major_version-${targetArch}" elif [ "$targetOs" = "haiku" ]; then - __uname_release=$(uname -r) + __uname_release="$(uname -r)" nonPortableRid=haiku.r"$__uname_release"-"$targetArch" fi - echo "$(echo $nonPortableRid | tr '[:upper:]' '[:lower:]')" + echo "$nonPortableRid" | tr '[:upper:]' '[:lower:]' } # initDistroRidGlobal @@ -85,26 +84,23 @@ getNonPortableDistroRid() # None # # Notes: -# -# It is important to note that the function does not return anything, but it -# exports the following variables on success: -# -# __DistroRid : Non-portable rid of the target platform. -# __PortableTargetOS : OS-part of the portable rid that corresponds to the target platform. -# +# It is important to note that the function does not return anything, but it +# exports the following variables on success: +# __DistroRid : Non-portable rid of the target platform. +# __PortableTargetOS : OS-part of the portable rid that corresponds to the target platform. initDistroRidGlobal() { - local targetOs="$1" - local targetArch="$2" - local rootfsDir="" - if [ "$#" -ge 3 ]; then + targetOs="$1" + targetArch="$2" + rootfsDir="" + if [ $# -ge 3 ]; then rootfsDir="$3" fi if [ -n "${rootfsDir}" ]; then # We may have a cross build. Check for the existence of the rootfsDir if [ ! -e "${rootfsDir}" ]; then - echo "Error rootfsDir has been passed, but the location is not valid." + echo "Error: rootfsDir has been passed, but the location is not valid." exit 1 fi fi @@ -119,7 +115,7 @@ initDistroRidGlobal() STRINGS="$(command -v llvm-strings || true)" fi - # Check for musl-based distros (e.g Alpine Linux, Void Linux). + # Check for musl-based distros (e.g. Alpine Linux, Void Linux). if "${rootfsDir}/usr/bin/ldd" --version 2>&1 | grep -q musl || ( [ -n "$STRINGS" ] && "$STRINGS" "${rootfsDir}/usr/bin/ldd" 2>&1 | grep -q musl ); then __PortableTargetOS="linux-musl" diff --git a/eng/common/native/init-os-and-arch.sh b/eng/common/native/init-os-and-arch.sh index caa448ff030..38921d4338f 100644 --- a/eng/common/native/init-os-and-arch.sh +++ b/eng/common/native/init-os-and-arch.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/sh # Use uname to determine what the OS is. OSName=$(uname -s | tr '[:upper:]' '[:lower:]') @@ -54,6 +54,7 @@ case "$CPUName" in ;; armv7l|armv8l) + # shellcheck disable=SC1091 if (NAME=""; . /etc/os-release; test "$NAME" = "Tizen"); then arch=armel else diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 7d8dc89b919..269fdb9420d 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -65,6 +65,9 @@ $ErrorActionPreference = 'Stop' # Base-64 encoded SAS token that has permission to storage container described by $runtimeSourceFeed [string]$runtimeSourceFeedKey = if (Test-Path variable:runtimeSourceFeedKey) { $runtimeSourceFeedKey } else { $null } +# True if the build is a product build +[bool]$productBuild = if (Test-Path variable:productBuild) { $productBuild } else { $false } + function Create-Directory ([string[]] $path) { New-Item -Path $path -Force -ItemType 'Directory' | Out-Null } @@ -850,7 +853,8 @@ function MSBuild-Core() { } # When running on Azure Pipelines, override the returned exit code to avoid double logging. - if ($ci -and $env:SYSTEM_TEAMPROJECT -ne $null) { + # Skip this when the build is a child of the VMR orchestrator build. + if ($ci -and $env:SYSTEM_TEAMPROJECT -ne $null -and !$productBuild -and $properties -notlike "*DotNetBuildRepo=true*") { Write-PipelineSetResult -Result "Failed" -Message "msbuild execution failed." # Exiting with an exit code causes the azure pipelines task to log yet another "noise" error # The above Write-PipelineSetResult will cause the task to be marked as failure without adding yet another error diff --git a/eng/common/tools.sh b/eng/common/tools.sh index ece4b730795..803907795c1 100644 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -68,6 +68,9 @@ fi runtime_source_feed=${runtime_source_feed:-''} runtime_source_feed_key=${runtime_source_feed_key:-''} +# True if the build is a product build +product_build=${product_build:-false} + # Resolve any symlinks in the given path. function ResolvePath { local path=$1 @@ -503,7 +506,8 @@ function MSBuild-Core { echo "Build failed with exit code $exit_code. Check errors above." # When running on Azure Pipelines, override the returned exit code to avoid double logging. - if [[ "$ci" == "true" && -n ${SYSTEM_TEAMPROJECT:-} ]]; then + # Skip this when the build is a child of the VMR orchestrator build. + if [[ "$ci" == true && -n ${SYSTEM_TEAMPROJECT:-} && "$product_build" != true && $properties != *"DotNetBuildRepo=true"* ]]; then Write-PipelineSetResult -result "Failed" -message "msbuild execution failed." # Exiting with an exit code causes the azure pipelines task to log yet another "noise" error # The above Write-PipelineSetResult will cause the task to be marked as failure without adding yet another error diff --git a/global.json b/global.json index 908cf4bae46..b5f98cea6fe 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "9.0.100-preview.1.24076.14", + "dotnet": "9.0.100-preview.1.24101.2", "runtimes": { "aspnetcore": [ "$(MicrosoftAspNetCoreApp60Version)", @@ -31,7 +31,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24114.1", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24114.1" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24127.2", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24127.2" } } From 2bcfe408505eef380f9f16e20ab607e8e6b0542c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 27 Feb 2024 09:20:37 -0800 Subject: [PATCH 068/568] Update dependencies from https://github.com/dotnet/command-line-api build 20240226.1 (#6125) System.CommandLine From Version 2.0.0-beta4.24123.1 -> To Version 2.0.0-beta4.24126.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9d7b00fcfd8..c7b62564942 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -12,9 +12,9 @@ https://github.com/dotnet/diagnostics d498654de4bf01e02ec689a51923e8c18b9c8d9c - + https://github.com/dotnet/command-line-api - 94ef1b035c73904f2240b3b3b0de6c4890dab6d8 + 5ea97af07263ea3ef68a18557c8aa3f7e3200bda diff --git a/eng/Versions.props b/eng/Versions.props index 98acc0db593..679bfcb14ff 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -60,7 +60,7 @@ 9.0.0-preview.2.24120.6 9.0.0-preview.2.24120.6 - 2.0.0-beta4.24123.1 + 2.0.0-beta4.24126.1 8.0.0-preview.24122.1 8.0.0-preview.24122.1 From 6a8ec331795de54e45aba3cbe593b43b0446631f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 27 Feb 2024 09:20:57 -0800 Subject: [PATCH 069/568] [feature/9.x] Update dependencies from dotnet/diagnostics (#6108) * Update dependencies from https://github.com/dotnet/diagnostics build 20240223.1 Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe From Version 8.0.0-preview.24122.1 -> To Version 8.0.0-preview.24123.1 * Update dependencies from https://github.com/dotnet/diagnostics build 20240223.1 Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe From Version 8.0.0-preview.24122.1 -> To Version 8.0.0-preview.24123.1 * Update dependencies from https://github.com/dotnet/diagnostics build 20240223.1 Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe From Version 8.0.0-preview.24122.1 -> To Version 8.0.0-preview.24123.1 * Update dependencies from https://github.com/dotnet/diagnostics build 20240226.1 Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe From Version 8.0.0-preview.24122.1 -> To Version 8.0.0-preview.24126.1 --------- Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c7b62564942..0a3e0ffe79e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore f26b79eb34d13648bedc5ec98e2151f8c55db978 - + https://github.com/dotnet/diagnostics - d498654de4bf01e02ec689a51923e8c18b9c8d9c + 2be99ebb06f50c2a57ff91e63765e2c29db1b76b - + https://github.com/dotnet/diagnostics - d498654de4bf01e02ec689a51923e8c18b9c8d9c + 2be99ebb06f50c2a57ff91e63765e2c29db1b76b https://github.com/dotnet/command-line-api diff --git a/eng/Versions.props b/eng/Versions.props index 679bfcb14ff..e68babdec97 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -62,8 +62,8 @@ 2.0.0-beta4.24126.1 - 8.0.0-preview.24122.1 - 8.0.0-preview.24122.1 + 8.0.0-preview.24126.1 + 8.0.0-preview.24126.1 9.0.100-preview.2.24122.4 From 4f9931a8f05582dab6108e8b1bf13c06bfd37542 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 28 Feb 2024 16:18:20 +0000 Subject: [PATCH 070/568] Update dependencies from https://github.com/dotnet/diagnostics build 20240227.1 (#6132) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0a3e0ffe79e..fd3c3edc31c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore f26b79eb34d13648bedc5ec98e2151f8c55db978 - + https://github.com/dotnet/diagnostics - 2be99ebb06f50c2a57ff91e63765e2c29db1b76b + aad90b9b830f8694c12ec26ff6ee84fed373d907 - + https://github.com/dotnet/diagnostics - 2be99ebb06f50c2a57ff91e63765e2c29db1b76b + aad90b9b830f8694c12ec26ff6ee84fed373d907 https://github.com/dotnet/command-line-api diff --git a/eng/Versions.props b/eng/Versions.props index e68babdec97..c2479ee3741 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -62,8 +62,8 @@ 2.0.0-beta4.24126.1 - 8.0.0-preview.24126.1 - 8.0.0-preview.24126.1 + 8.0.0-preview.24127.1 + 8.0.0-preview.24127.1 9.0.100-preview.2.24122.4 From 034a8e1636a861e2e4b3651e81358000963112b9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 28 Feb 2024 10:41:46 -0800 Subject: [PATCH 071/568] [feature/9.x] Update dependencies from dotnet/installer (#6111) * Update dependencies from https://github.com/dotnet/installer build 20240223.6 Microsoft.Dotnet.Sdk.Internal From Version 9.0.100-preview.2.24122.4 -> To Version 9.0.100-preview.3.24123.6 Dependency coherency updates Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0 From Version 9.0.0-preview.2.24120.6 -> To Version 9.0.0-preview.2.24121.1 (parent: Microsoft.Dotnet.Sdk.Internal * Update dependencies from https://github.com/dotnet/installer build 20240223.6 Microsoft.Dotnet.Sdk.Internal From Version 9.0.100-preview.2.24122.4 -> To Version 9.0.100-preview.3.24123.6 Dependency coherency updates Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0 From Version 9.0.0-preview.2.24120.6 -> To Version 9.0.0-preview.2.24121.1 (parent: Microsoft.Dotnet.Sdk.Internal * Update dependencies from https://github.com/dotnet/installer build 20240226.2 Microsoft.Dotnet.Sdk.Internal From Version 9.0.100-preview.2.24122.4 -> To Version 9.0.100-preview.3.24126.2 Dependency coherency updates Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0 From Version 9.0.0-preview.2.24120.6 -> To Version 9.0.0-preview.2.24121.1 (parent: Microsoft.Dotnet.Sdk.Internal * Update dependencies from https://github.com/dotnet/installer build 20240227.3 Microsoft.Dotnet.Sdk.Internal From Version 9.0.100-preview.2.24122.4 -> To Version 9.0.100-preview.3.24127.3 Dependency coherency updates Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0 From Version 9.0.0-preview.2.24120.6 -> To Version 9.0.0-preview.2.24121.1 (parent: Microsoft.Dotnet.Sdk.Internal * Update dependencies from https://github.com/dotnet/installer build 20240227.13 Microsoft.Dotnet.Sdk.Internal From Version 9.0.100-preview.2.24122.4 -> To Version 9.0.100-preview.3.24127.13 Dependency coherency updates Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0 From Version 9.0.0-preview.2.24120.6 -> To Version 9.0.0-preview.2.24121.1 (parent: Microsoft.Dotnet.Sdk.Internal --------- Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fd3c3edc31c..d82585b3ad2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/aspnetcore - f26b79eb34d13648bedc5ec98e2151f8c55db978 + cc5bc6b56dc0a6e6f1ca103acff5afd9c71973ba https://github.com/dotnet/diagnostics @@ -38,9 +38,9 @@ https://github.com/dotnet/arcade d9930e5e9a0069e5b7726c119f614486b8ef438f - + https://github.com/dotnet/installer - ed324e09c77034992ce5af746f37d99dd69580f6 + 29abe93c1a0b1feaac240c844df54aeb580e90f1 https://github.com/dotnet/arcade @@ -50,17 +50,17 @@ https://github.com/dotnet/symstore 96a152a28e86ecc5c68ec9a73e02bb1e93163338 - + https://github.com/dotnet/runtime - 1b1d26ac74e374309fb101382026ba0480d3821d + 99b76018b6e4edc4ce185dd5f3c5697c6941d88e - + https://github.com/dotnet/aspnetcore - f26b79eb34d13648bedc5ec98e2151f8c55db978 + cc5bc6b56dc0a6e6f1ca103acff5afd9c71973ba - + https://github.com/dotnet/runtime - 1b1d26ac74e374309fb101382026ba0480d3821d + 99b76018b6e4edc4ce185dd5f3c5697c6941d88e diff --git a/eng/Versions.props b/eng/Versions.props index c2479ee3741..9ffa36b5759 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,20 +57,20 @@ 9.0.0-beta.24127.2 9.0.0-beta.24127.2 - 9.0.0-preview.2.24120.6 - 9.0.0-preview.2.24120.6 + 9.0.0-preview.2.24121.1 + 9.0.0-preview.2.24121.1 2.0.0-beta4.24126.1 8.0.0-preview.24127.1 8.0.0-preview.24127.1 - 9.0.100-preview.2.24122.4 + 9.0.100-preview.3.24127.13 9.0.0-preview.24121.1 - 9.0.0-preview.2.24120.11 - 9.0.0-preview.2.24120.11 + 9.0.0-preview.2.24123.1 + 9.0.0-preview.2.24123.1 1.0.511901 From 4e50245c7d74b01b21e95136e8caa4868894641f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 28 Feb 2024 13:15:44 -0800 Subject: [PATCH 072/568] [feature/9.x] Update dependencies from dotnet/roslyn-analyzers (#6103) * Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20240222.2 Microsoft.CodeAnalysis.NetAnalyzers From Version 9.0.0-preview.24121.1 -> To Version 9.0.0-preview.24122.2 * Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20240222.2 Microsoft.CodeAnalysis.NetAnalyzers From Version 9.0.0-preview.24121.1 -> To Version 9.0.0-preview.24122.2 * Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20240222.2 Microsoft.CodeAnalysis.NetAnalyzers From Version 9.0.0-preview.24121.1 -> To Version 9.0.0-preview.24122.2 * Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20240222.2 Microsoft.CodeAnalysis.NetAnalyzers From Version 9.0.0-preview.24121.1 -> To Version 9.0.0-preview.24122.2 * Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20240226.1 Microsoft.CodeAnalysis.NetAnalyzers From Version 9.0.0-preview.24121.1 -> To Version 9.0.0-preview.24126.1 * Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20240227.1 Microsoft.CodeAnalysis.NetAnalyzers From Version 9.0.0-preview.24121.1 -> To Version 9.0.0-preview.24127.1 --------- Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d82585b3ad2..e3f1aba297d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -18,9 +18,9 @@ - + https://github.com/dotnet/roslyn-analyzers - 4195460a822168a75aa3d31b4a8d0fa88c42855c + 6fcb27ca8d798611cc5acabd1a40a483def32d93 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 9ffa36b5759..e38a6710d0a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -67,7 +67,7 @@ 9.0.100-preview.3.24127.13 - 9.0.0-preview.24121.1 + 9.0.0-preview.24127.1 9.0.0-preview.2.24123.1 9.0.0-preview.2.24123.1 From 873e71bba9b16bff70a4c045ebbb4feee3db2abf Mon Sep 17 00:00:00 2001 From: Joe Schmitt <1146681+schmittjoseph@users.noreply.github.com> Date: Wed, 28 Feb 2024 14:37:34 -0800 Subject: [PATCH 073/568] Update .gitattributes (#6136) --- .gitattributes | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.gitattributes b/.gitattributes index e53d317832e..e2a58888b27 100644 --- a/.gitattributes +++ b/.gitattributes @@ -47,3 +47,14 @@ ############################################################################### *.png binary *.snk binary + +############################################################################### +# Define branch specific files by overriding the merge driver +# Must be kept in sync with .github\workflows\sync-branches.yml +############################################################################### +global.json merge=ours +eng/branch-vscode-config merge=ours +eng/common merge=ours +eng/Common.props merge=ours +eng/Versions.props merge=ours +eng/Version.Details.xml merge=ours From 1ff3650aef832a3d32b25e539b020080594c501b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 29 Feb 2024 00:22:00 +0000 Subject: [PATCH 074/568] Restore branch-specific files --- eng/common/templates/steps/generate-sbom.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/common/templates/steps/generate-sbom.yml b/eng/common/templates/steps/generate-sbom.yml index 2b21eae4273..a06373f38fa 100644 --- a/eng/common/templates/steps/generate-sbom.yml +++ b/eng/common/templates/steps/generate-sbom.yml @@ -5,7 +5,7 @@ # IgnoreDirectories - Directories to ignore for SBOM generation. This will be passed through to the CG component detector. parameters: - PackageVersion: 8.0.0 + PackageVersion: 7.0.0 BuildDropPath: '$(Build.SourcesDirectory)/artifacts' PackageName: '.NET' ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom From b30e457aba53766e6b104b5a43190f072b167711 Mon Sep 17 00:00:00 2001 From: Joe Schmitt <1146681+schmittjoseph@users.noreply.github.com> Date: Wed, 28 Feb 2024 16:27:55 -0800 Subject: [PATCH 075/568] Backport #6071 --- eng/Versions.props | 5 ----- 1 file changed, 5 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index e38a6710d0a..26f8b31e39f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,11 +1,6 @@ - - - - - https://github.com/dotnet/dotnet-monitor 9.0.0 From 9621dde76b7e808f9bffdb6a942f508b9729dc4d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 29 Feb 2024 17:28:47 +0000 Subject: [PATCH 076/568] [feature/9.x] Update dependencies from dotnet/arcade (#6133) [feature/9.x] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- eng/common/tools.ps1 | 2 ++ eng/common/tools.sh | 4 ++-- global.json | 4 ++-- 5 files changed, 19 insertions(+), 17 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e3f1aba297d..70801db8095 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,29 +22,29 @@ https://github.com/dotnet/roslyn-analyzers 6fcb27ca8d798611cc5acabd1a40a483def32d93 - + https://github.com/dotnet/arcade - d9930e5e9a0069e5b7726c119f614486b8ef438f + 7582b5deefe451b6453a7693197df02ef1558d4b - + https://github.com/dotnet/arcade - d9930e5e9a0069e5b7726c119f614486b8ef438f + 7582b5deefe451b6453a7693197df02ef1558d4b - + https://github.com/dotnet/arcade - d9930e5e9a0069e5b7726c119f614486b8ef438f + 7582b5deefe451b6453a7693197df02ef1558d4b - + https://github.com/dotnet/arcade - d9930e5e9a0069e5b7726c119f614486b8ef438f + 7582b5deefe451b6453a7693197df02ef1558d4b https://github.com/dotnet/installer 29abe93c1a0b1feaac240c844df54aeb580e90f1 - + https://github.com/dotnet/arcade - d9930e5e9a0069e5b7726c119f614486b8ef438f + 7582b5deefe451b6453a7693197df02ef1558d4b https://github.com/dotnet/symstore diff --git a/eng/Versions.props b/eng/Versions.props index 26f8b31e39f..fc0f98aa126 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,9 +48,9 @@ --> - 9.0.0-beta.24127.2 - 9.0.0-beta.24127.2 - 9.0.0-beta.24127.2 + 9.0.0-beta.24128.1 + 9.0.0-beta.24128.1 + 9.0.0-beta.24128.1 9.0.0-preview.2.24121.1 9.0.0-preview.2.24121.1 diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 269fdb9420d..9bf873e3c25 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -68,6 +68,8 @@ $ErrorActionPreference = 'Stop' # True if the build is a product build [bool]$productBuild = if (Test-Path variable:productBuild) { $productBuild } else { $false } +[String[]]$properties = if (Test-Path variable:properties) { $properties } else { @() } + function Create-Directory ([string[]] $path) { New-Item -Path $path -Force -ItemType 'Directory' | Out-Null } diff --git a/eng/common/tools.sh b/eng/common/tools.sh index 803907795c1..db64e298ff6 100644 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -144,7 +144,7 @@ function InitializeDotNetCli { if [[ $global_json_has_runtimes == false && -n "${DOTNET_INSTALL_DIR:-}" && -d "$DOTNET_INSTALL_DIR/sdk/$dotnet_sdk_version" ]]; then dotnet_root="$DOTNET_INSTALL_DIR" else - dotnet_root="$repo_root/.dotnet" + dotnet_root="${repo_root}.dotnet" export DOTNET_INSTALL_DIR="$dotnet_root" @@ -507,7 +507,7 @@ function MSBuild-Core { # When running on Azure Pipelines, override the returned exit code to avoid double logging. # Skip this when the build is a child of the VMR orchestrator build. - if [[ "$ci" == true && -n ${SYSTEM_TEAMPROJECT:-} && "$product_build" != true && $properties != *"DotNetBuildRepo=true"* ]]; then + if [[ "$ci" == true && -n ${SYSTEM_TEAMPROJECT:-} && "$product_build" != true && "$properties" != *"DotNetBuildRepo=true"* ]]; then Write-PipelineSetResult -result "Failed" -message "msbuild execution failed." # Exiting with an exit code causes the azure pipelines task to log yet another "noise" error # The above Write-PipelineSetResult will cause the task to be marked as failure without adding yet another error diff --git a/global.json b/global.json index b5f98cea6fe..244b590d679 100644 --- a/global.json +++ b/global.json @@ -31,7 +31,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24127.2", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24127.2" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24128.1", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24128.1" } } From deb530193b6ab536dabceaa0b4874ea773a66a87 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 29 Feb 2024 09:29:23 -0800 Subject: [PATCH 077/568] Update dependencies from https://github.com/dotnet/installer build 20240229.4 (#6144) Microsoft.Dotnet.Sdk.Internal From Version 9.0.100-preview.3.24127.13 -> To Version 9.0.100-preview.3.24129.4 Dependency coherency updates Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0 From Version 9.0.0-preview.2.24121.1 -> To Version 9.0.0-preview.3.24128.1 (parent: Microsoft.Dotnet.Sdk.Internal Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 70801db8095..a3eb0aba235 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/aspnetcore - cc5bc6b56dc0a6e6f1ca103acff5afd9c71973ba + 099bc84939fec64e803ec173dac6aa8ceb46a8cc https://github.com/dotnet/diagnostics @@ -38,9 +38,9 @@ https://github.com/dotnet/arcade 7582b5deefe451b6453a7693197df02ef1558d4b - + https://github.com/dotnet/installer - 29abe93c1a0b1feaac240c844df54aeb580e90f1 + 3d92d994e433a20b60a918620ce03672bafd8bca https://github.com/dotnet/arcade @@ -50,17 +50,17 @@ https://github.com/dotnet/symstore 96a152a28e86ecc5c68ec9a73e02bb1e93163338 - + https://github.com/dotnet/runtime - 99b76018b6e4edc4ce185dd5f3c5697c6941d88e + f632b55cfe2a8cfa9e1a0867c6fda761646e3601 - + https://github.com/dotnet/aspnetcore - cc5bc6b56dc0a6e6f1ca103acff5afd9c71973ba + 099bc84939fec64e803ec173dac6aa8ceb46a8cc - + https://github.com/dotnet/runtime - 99b76018b6e4edc4ce185dd5f3c5697c6941d88e + f632b55cfe2a8cfa9e1a0867c6fda761646e3601 diff --git a/eng/Versions.props b/eng/Versions.props index fc0f98aa126..297f6fba0c4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,20 +52,20 @@ 9.0.0-beta.24128.1 9.0.0-beta.24128.1 - 9.0.0-preview.2.24121.1 - 9.0.0-preview.2.24121.1 + 9.0.0-preview.3.24128.1 + 9.0.0-preview.3.24128.1 2.0.0-beta4.24126.1 8.0.0-preview.24127.1 8.0.0-preview.24127.1 - 9.0.100-preview.3.24127.13 + 9.0.100-preview.3.24129.4 9.0.0-preview.24127.1 - 9.0.0-preview.2.24123.1 - 9.0.0-preview.2.24123.1 + 9.0.0-preview.3.24126.5 + 9.0.0-preview.3.24126.5 1.0.511901 From 30ccf90ef37a0802c0a50605f1515637f79719bf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 29 Feb 2024 18:43:44 +0000 Subject: [PATCH 078/568] Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20240228.1 (#6145) Microsoft.CodeAnalysis.NetAnalyzers From Version 9.0.0-preview.24127.1 -> To Version 9.0.0-preview.24128.1 Co-authored-by: dotnet-maestro[bot] Co-authored-by: Joe Schmitt --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a3eb0aba235..1d2273e7fcf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -18,9 +18,9 @@ - + https://github.com/dotnet/roslyn-analyzers - 6fcb27ca8d798611cc5acabd1a40a483def32d93 + 0e9cb2a3c38706574f2d02fd70ce1e66c7dd4c5f https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 297f6fba0c4..6123495ef81 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -62,7 +62,7 @@ 9.0.100-preview.3.24129.4 - 9.0.0-preview.24127.1 + 9.0.0-preview.24128.1 9.0.0-preview.3.24126.5 9.0.0-preview.3.24126.5 From 79b242543f4cf2361d802009ed91452b6a56958e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 1 Mar 2024 09:26:27 -0800 Subject: [PATCH 079/568] Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20240301.1 (#6153) Microsoft.CodeAnalysis.NetAnalyzers From Version 9.0.0-preview.24128.1 -> To Version 9.0.0-preview.24151.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1d2273e7fcf..8d73743f2b9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -18,9 +18,9 @@ - + https://github.com/dotnet/roslyn-analyzers - 0e9cb2a3c38706574f2d02fd70ce1e66c7dd4c5f + 59b2d9dc38fcc17dd618e3b3af3ce692aaeedb37 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 6123495ef81..71c820f81fe 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -62,7 +62,7 @@ 9.0.100-preview.3.24129.4 - 9.0.0-preview.24128.1 + 9.0.0-preview.24151.1 9.0.0-preview.3.24126.5 9.0.0-preview.3.24126.5 From 83c1188603df0b95fcf44b04e66864f4840ea186 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 2 Mar 2024 00:08:16 +0000 Subject: [PATCH 080/568] Update dependencies from https://github.com/dotnet/installer build 20240229.12 (#6152) Microsoft.Dotnet.Sdk.Internal From Version 9.0.100-preview.3.24129.4 -> To Version 9.0.100-preview.3.24129.12 Dependency coherency updates Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0 From Version 9.0.0-preview.3.24128.1 -> To Version 9.0.0-preview.3.24129.1 (parent: Microsoft.Dotnet.Sdk.Internal Co-authored-by: dotnet-maestro[bot] Co-authored-by: Joe Schmitt <1146681+schmittjoseph@users.noreply.github.com> --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8d73743f2b9..8e520fc9fb7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/aspnetcore - 099bc84939fec64e803ec173dac6aa8ceb46a8cc + 7874b36fd8da2f8e56b23aac48954f14bafba1fe https://github.com/dotnet/diagnostics @@ -38,9 +38,9 @@ https://github.com/dotnet/arcade 7582b5deefe451b6453a7693197df02ef1558d4b - + https://github.com/dotnet/installer - 3d92d994e433a20b60a918620ce03672bafd8bca + 001946486060e31dffa0f82a68c4db582c353af0 https://github.com/dotnet/arcade @@ -50,17 +50,17 @@ https://github.com/dotnet/symstore 96a152a28e86ecc5c68ec9a73e02bb1e93163338 - + https://github.com/dotnet/runtime - f632b55cfe2a8cfa9e1a0867c6fda761646e3601 + 5e603d595e63ddc5cdce9777a40608279abdcc37 - + https://github.com/dotnet/aspnetcore - 099bc84939fec64e803ec173dac6aa8ceb46a8cc + 7874b36fd8da2f8e56b23aac48954f14bafba1fe - + https://github.com/dotnet/runtime - f632b55cfe2a8cfa9e1a0867c6fda761646e3601 + 5e603d595e63ddc5cdce9777a40608279abdcc37 diff --git a/eng/Versions.props b/eng/Versions.props index 71c820f81fe..abd7dcbcf3e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,20 +52,20 @@ 9.0.0-beta.24128.1 9.0.0-beta.24128.1 - 9.0.0-preview.3.24128.1 - 9.0.0-preview.3.24128.1 + 9.0.0-preview.3.24129.1 + 9.0.0-preview.3.24129.1 2.0.0-beta4.24126.1 8.0.0-preview.24127.1 8.0.0-preview.24127.1 - 9.0.100-preview.3.24129.4 + 9.0.100-preview.3.24129.12 9.0.0-preview.24151.1 - 9.0.0-preview.3.24126.5 - 9.0.0-preview.3.24126.5 + 9.0.0-preview.3.24129.2 + 9.0.0-preview.3.24129.2 1.0.511901 From 42151adef1aba8a6c4022db72003b2ac21f43904 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 2 Mar 2024 00:17:33 +0000 Subject: [PATCH 081/568] [feature/9.x] Update dependencies from dotnet/diagnostics (#6143) * Update dependencies from https://github.com/dotnet/diagnostics build 20240228.1 Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe From Version 8.0.0-preview.24127.1 -> To Version 8.0.0-preview.24128.1 * Update dependencies from https://github.com/dotnet/diagnostics build 20240229.1 Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe From Version 8.0.0-preview.24127.1 -> To Version 8.0.0-preview.24129.1 --------- Co-authored-by: dotnet-maestro[bot] Co-authored-by: Joe Schmitt <1146681+schmittjoseph@users.noreply.github.com> --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8e520fc9fb7..2d029b8d9a5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore 7874b36fd8da2f8e56b23aac48954f14bafba1fe - + https://github.com/dotnet/diagnostics - aad90b9b830f8694c12ec26ff6ee84fed373d907 + 831eee3a9e69dd886fa190a9914a7f66260c653a - + https://github.com/dotnet/diagnostics - aad90b9b830f8694c12ec26ff6ee84fed373d907 + 831eee3a9e69dd886fa190a9914a7f66260c653a https://github.com/dotnet/command-line-api diff --git a/eng/Versions.props b/eng/Versions.props index abd7dcbcf3e..480dfcc08fa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24126.1 - 8.0.0-preview.24127.1 - 8.0.0-preview.24127.1 + 8.0.0-preview.24129.1 + 8.0.0-preview.24129.1 9.0.100-preview.3.24129.12 From 413a2d5818e82943bd685bbc0c1962b9bd412a41 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 2 Mar 2024 00:55:16 +0000 Subject: [PATCH 082/568] Update dependencies from https://github.com/dotnet/arcade build 20240301.1 (#6151) Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.24128.1 -> To Version 9.0.0-beta.24151.1 Co-authored-by: dotnet-maestro[bot] Co-authored-by: Joe Schmitt <1146681+schmittjoseph@users.noreply.github.com> --- eng/Version.Details.xml | 20 +- eng/Versions.props | 6 +- eng/common/templates-official/job/job.yml | 255 ++++++++++++++++ .../templates-official/job/onelocbuild.yml | 112 +++++++ .../job/publish-build-assets.yml | 157 ++++++++++ .../templates-official/job/source-build.yml | 67 ++++ .../job/source-index-stage1.yml | 67 ++++ .../templates-official/jobs/codeql-build.yml | 31 ++ eng/common/templates-official/jobs/jobs.yml | 97 ++++++ .../templates-official/jobs/source-build.yml | 46 +++ .../post-build/common-variables.yml | 24 ++ .../post-build/post-build.yml | 285 ++++++++++++++++++ .../post-build/setup-maestro-vars.yml | 70 +++++ .../post-build/trigger-subscription.yml | 13 + .../steps/add-build-to-channel.yml | 13 + .../steps/component-governance.yml | 13 + .../steps/generate-sbom.yml | 48 +++ .../templates-official/steps/publish-logs.yml | 49 +++ .../templates-official/steps/retain-build.yml | 28 ++ .../steps/send-to-helix.yml | 91 ++++++ .../templates-official/steps/source-build.yml | 129 ++++++++ .../variables/pool-providers.yml | 45 +++ .../variables/sdl-variables.yml | 7 + global.json | 4 +- 24 files changed, 1662 insertions(+), 15 deletions(-) create mode 100644 eng/common/templates-official/job/job.yml create mode 100644 eng/common/templates-official/job/onelocbuild.yml create mode 100644 eng/common/templates-official/job/publish-build-assets.yml create mode 100644 eng/common/templates-official/job/source-build.yml create mode 100644 eng/common/templates-official/job/source-index-stage1.yml create mode 100644 eng/common/templates-official/jobs/codeql-build.yml create mode 100644 eng/common/templates-official/jobs/jobs.yml create mode 100644 eng/common/templates-official/jobs/source-build.yml create mode 100644 eng/common/templates-official/post-build/common-variables.yml create mode 100644 eng/common/templates-official/post-build/post-build.yml create mode 100644 eng/common/templates-official/post-build/setup-maestro-vars.yml create mode 100644 eng/common/templates-official/post-build/trigger-subscription.yml create mode 100644 eng/common/templates-official/steps/add-build-to-channel.yml create mode 100644 eng/common/templates-official/steps/component-governance.yml create mode 100644 eng/common/templates-official/steps/generate-sbom.yml create mode 100644 eng/common/templates-official/steps/publish-logs.yml create mode 100644 eng/common/templates-official/steps/retain-build.yml create mode 100644 eng/common/templates-official/steps/send-to-helix.yml create mode 100644 eng/common/templates-official/steps/source-build.yml create mode 100644 eng/common/templates-official/variables/pool-providers.yml create mode 100644 eng/common/templates-official/variables/sdl-variables.yml diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2d029b8d9a5..79c856e9031 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,29 +22,29 @@ https://github.com/dotnet/roslyn-analyzers 59b2d9dc38fcc17dd618e3b3af3ce692aaeedb37 - + https://github.com/dotnet/arcade - 7582b5deefe451b6453a7693197df02ef1558d4b + d4a7b37f268cb5fe89f4472ef5341629cd040dfe - + https://github.com/dotnet/arcade - 7582b5deefe451b6453a7693197df02ef1558d4b + d4a7b37f268cb5fe89f4472ef5341629cd040dfe - + https://github.com/dotnet/arcade - 7582b5deefe451b6453a7693197df02ef1558d4b + d4a7b37f268cb5fe89f4472ef5341629cd040dfe - + https://github.com/dotnet/arcade - 7582b5deefe451b6453a7693197df02ef1558d4b + d4a7b37f268cb5fe89f4472ef5341629cd040dfe https://github.com/dotnet/installer 001946486060e31dffa0f82a68c4db582c353af0 - + https://github.com/dotnet/arcade - 7582b5deefe451b6453a7693197df02ef1558d4b + d4a7b37f268cb5fe89f4472ef5341629cd040dfe https://github.com/dotnet/symstore diff --git a/eng/Versions.props b/eng/Versions.props index 480dfcc08fa..170439603bf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,9 +48,9 @@ --> - 9.0.0-beta.24128.1 - 9.0.0-beta.24128.1 - 9.0.0-beta.24128.1 + 9.0.0-beta.24151.1 + 9.0.0-beta.24151.1 + 9.0.0-beta.24151.1 9.0.0-preview.3.24129.1 9.0.0-preview.3.24129.1 diff --git a/eng/common/templates-official/job/job.yml b/eng/common/templates-official/job/job.yml new file mode 100644 index 00000000000..352607308fd --- /dev/null +++ b/eng/common/templates-official/job/job.yml @@ -0,0 +1,255 @@ +# Internal resources (telemetry, microbuild) can only be accessed from non-public projects, +# and some (Microbuild) should only be applied to non-PR cases for internal builds. + +parameters: +# Job schema parameters - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#job + cancelTimeoutInMinutes: '' + condition: '' + container: '' + continueOnError: false + dependsOn: '' + displayName: '' + pool: '' + steps: [] + strategy: '' + timeoutInMinutes: '' + variables: [] + workspace: '' + +# Job base template specific parameters + # See schema documentation - https://github.com/dotnet/arcade/blob/master/Documentation/AzureDevOps/TemplateSchema.md + artifacts: '' + enableMicrobuild: false + enablePublishBuildArtifacts: false + enablePublishBuildAssets: false + enablePublishTestResults: false + enablePublishUsingPipelines: false + enableBuildRetry: false + disableComponentGovernance: '' + componentGovernanceIgnoreDirectories: '' + mergeTestResults: false + testRunTitle: '' + testResultsFormat: '' + name: '' + preSteps: [] + runAsPublic: false +# Sbom related params + enableSbom: true + PackageVersion: 7.0.0 + BuildDropPath: '$(Build.SourcesDirectory)/artifacts' + +jobs: +- job: ${{ parameters.name }} + + ${{ if ne(parameters.cancelTimeoutInMinutes, '') }}: + cancelTimeoutInMinutes: ${{ parameters.cancelTimeoutInMinutes }} + + ${{ if ne(parameters.condition, '') }}: + condition: ${{ parameters.condition }} + + ${{ if ne(parameters.container, '') }}: + container: ${{ parameters.container }} + + ${{ if ne(parameters.continueOnError, '') }}: + continueOnError: ${{ parameters.continueOnError }} + + ${{ if ne(parameters.dependsOn, '') }}: + dependsOn: ${{ parameters.dependsOn }} + + ${{ if ne(parameters.displayName, '') }}: + displayName: ${{ parameters.displayName }} + + ${{ if ne(parameters.pool, '') }}: + pool: ${{ parameters.pool }} + + ${{ if ne(parameters.strategy, '') }}: + strategy: ${{ parameters.strategy }} + + ${{ if ne(parameters.timeoutInMinutes, '') }}: + timeoutInMinutes: ${{ parameters.timeoutInMinutes }} + + variables: + - ${{ if ne(parameters.enableTelemetry, 'false') }}: + - name: DOTNET_CLI_TELEMETRY_PROFILE + value: '$(Build.Repository.Uri)' + - ${{ if eq(parameters.enableRichCodeNavigation, 'true') }}: + - name: EnableRichCodeNavigation + value: 'true' + # Retry signature validation up to three times, waiting 2 seconds between attempts. + # See https://learn.microsoft.com/en-us/nuget/reference/errors-and-warnings/nu3028#retry-untrusted-root-failures + - name: NUGET_EXPERIMENTAL_CHAIN_BUILD_RETRY_POLICY + value: 3,2000 + - ${{ each variable in parameters.variables }}: + # handle name-value variable syntax + # example: + # - name: [key] + # value: [value] + - ${{ if ne(variable.name, '') }}: + - name: ${{ variable.name }} + value: ${{ variable.value }} + + # handle variable groups + - ${{ if ne(variable.group, '') }}: + - group: ${{ variable.group }} + + # handle template variable syntax + # example: + # - template: path/to/template.yml + # parameters: + # [key]: [value] + - ${{ if ne(variable.template, '') }}: + - template: ${{ variable.template }} + ${{ if ne(variable.parameters, '') }}: + parameters: ${{ variable.parameters }} + + # handle key-value variable syntax. + # example: + # - [key]: [value] + - ${{ if and(eq(variable.name, ''), eq(variable.group, ''), eq(variable.template, '')) }}: + - ${{ each pair in variable }}: + - name: ${{ pair.key }} + value: ${{ pair.value }} + + # DotNet-HelixApi-Access provides 'HelixApiAccessToken' for internal builds + - ${{ if and(eq(parameters.enableTelemetry, 'true'), eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - group: DotNet-HelixApi-Access + + ${{ if ne(parameters.workspace, '') }}: + workspace: ${{ parameters.workspace }} + + steps: + - ${{ if ne(parameters.preSteps, '') }}: + - ${{ each preStep in parameters.preSteps }}: + - ${{ preStep }} + + - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - ${{ if eq(parameters.enableMicrobuild, 'true') }}: + - task: MicroBuildSigningPlugin@3 + displayName: Install MicroBuild plugin + inputs: + signType: $(_SignType) + zipSources: false + feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json + env: + TeamName: $(_TeamName) + continueOnError: ${{ parameters.continueOnError }} + 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@1 + + - ${{ if and(ne(parameters.artifacts.download, 'false'), ne(parameters.artifacts.download, '')) }}: + - task: DownloadPipelineArtifact@2 + inputs: + buildType: current + artifactName: ${{ coalesce(parameters.artifacts.download.name, 'Artifacts_$(Agent.OS)_$(_BuildConfig)') }} + targetPath: ${{ coalesce(parameters.artifacts.download.path, 'artifacts') }} + itemPattern: ${{ coalesce(parameters.artifacts.download.pattern, '**') }} + + - ${{ each step in parameters.steps }}: + - ${{ step }} + + - ${{ if eq(parameters.enableRichCodeNavigation, true) }}: + - task: RichCodeNavIndexer@0 + displayName: RichCodeNav Upload + inputs: + languages: ${{ coalesce(parameters.richCodeNavigationLanguage, 'csharp') }} + environment: ${{ coalesce(parameters.richCodeNavigationEnvironment, 'internal') }} + richNavLogOutputDirectory: $(Build.SourcesDirectory)/artifacts/bin + uploadRichNavArtifacts: ${{ coalesce(parameters.richCodeNavigationUploadArtifacts, false) }} + continueOnError: true + + - template: /eng/common/templates-official/steps/component-governance.yml + parameters: + ${{ if eq(parameters.disableComponentGovernance, '') }}: + ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.runAsPublic, 'false'), or(startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/dotnet/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/microsoft/'), eq(variables['Build.SourceBranch'], 'refs/heads/main'))) }}: + disableComponentGovernance: false + ${{ else }}: + disableComponentGovernance: true + ${{ else }}: + disableComponentGovernance: ${{ parameters.disableComponentGovernance }} + componentGovernanceIgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }} + + - ${{ if eq(parameters.enableMicrobuild, 'true') }}: + - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - task: MicroBuildCleanup@1 + displayName: Execute Microbuild cleanup tasks + condition: and(always(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT')) + continueOnError: ${{ parameters.continueOnError }} + env: + TeamName: $(_TeamName) + + - ${{ if ne(parameters.artifacts.publish, '') }}: + - ${{ if and(ne(parameters.artifacts.publish.artifacts, 'false'), ne(parameters.artifacts.publish.artifacts, '')) }}: + - task: CopyFiles@2 + displayName: Gather binaries for publish to artifacts + inputs: + SourceFolder: 'artifacts/bin' + Contents: '**' + TargetFolder: '$(Build.ArtifactStagingDirectory)/artifacts/bin' + - task: CopyFiles@2 + displayName: Gather packages for publish to artifacts + inputs: + SourceFolder: 'artifacts/packages' + Contents: '**' + TargetFolder: '$(Build.ArtifactStagingDirectory)/artifacts/packages' + - task: 1ES.PublishBuildArtifacts@1 + displayName: Publish pipeline artifacts + inputs: + PathtoPublish: '$(Build.ArtifactStagingDirectory)/artifacts' + PublishLocation: Container + ArtifactName: ${{ coalesce(parameters.artifacts.publish.artifacts.name , 'Artifacts_$(Agent.Os)_$(_BuildConfig)') }} + continueOnError: true + condition: always() + - ${{ if and(ne(parameters.artifacts.publish.logs, 'false'), ne(parameters.artifacts.publish.logs, '')) }}: + - publish: artifacts/log + artifact: ${{ coalesce(parameters.artifacts.publish.logs.name, 'Logs_Build_$(Agent.Os)_$(_BuildConfig)') }} + displayName: Publish logs + continueOnError: true + condition: always() + + - ${{ if ne(parameters.enablePublishBuildArtifacts, 'false') }}: + - task: 1ES.PublishBuildArtifacts@1 + displayName: Publish Logs + inputs: + PathtoPublish: '$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)' + PublishLocation: Container + ArtifactName: ${{ coalesce(parameters.enablePublishBuildArtifacts.artifactName, '$(Agent.Os)_$(Agent.JobName)' ) }} + continueOnError: true + condition: always() + + - ${{ if or(and(eq(parameters.enablePublishTestResults, 'true'), eq(parameters.testResultsFormat, '')), eq(parameters.testResultsFormat, 'xunit')) }}: + - task: PublishTestResults@2 + displayName: Publish XUnit Test Results + inputs: + testResultsFormat: 'xUnit' + testResultsFiles: '*.xml' + searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)' + testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-xunit + mergeTestResults: ${{ parameters.mergeTestResults }} + continueOnError: true + condition: always() + - ${{ if or(and(eq(parameters.enablePublishTestResults, 'true'), eq(parameters.testResultsFormat, '')), eq(parameters.testResultsFormat, 'vstest')) }}: + - task: PublishTestResults@2 + displayName: Publish TRX Test Results + inputs: + testResultsFormat: 'VSTest' + testResultsFiles: '*.trx' + searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)' + testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-trx + mergeTestResults: ${{ parameters.mergeTestResults }} + continueOnError: true + condition: always() + + - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.enableSbom, 'true')) }}: + - template: /eng/common/templates-official/steps/generate-sbom.yml + parameters: + PackageVersion: ${{ parameters.packageVersion}} + BuildDropPath: ${{ parameters.buildDropPath }} + IgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }} + + - ${{ if eq(parameters.enableBuildRetry, 'true') }}: + - publish: $(Build.SourcesDirectory)\eng\common\BuildConfiguration + artifact: BuildConfiguration + displayName: Publish build retry configuration + continueOnError: true diff --git a/eng/common/templates-official/job/onelocbuild.yml b/eng/common/templates-official/job/onelocbuild.yml new file mode 100644 index 00000000000..ba9ba493032 --- /dev/null +++ b/eng/common/templates-official/job/onelocbuild.yml @@ -0,0 +1,112 @@ +parameters: + # Optional: dependencies of the job + dependsOn: '' + + # Optional: A defined YAML pool - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#pool + pool: '' + + CeapexPat: $(dn-bot-ceapex-package-r) # PAT for the loc AzDO instance https://dev.azure.com/ceapex + GithubPat: $(BotAccount-dotnet-bot-repo-PAT) + + SourcesDirectory: $(Build.SourcesDirectory) + CreatePr: true + AutoCompletePr: false + ReusePr: true + UseLfLineEndings: true + UseCheckedInLocProjectJson: false + SkipLocProjectJsonGeneration: false + LanguageSet: VS_Main_Languages + LclSource: lclFilesInRepo + LclPackageId: '' + RepoType: gitHub + GitHubOrg: dotnet + MirrorRepo: '' + MirrorBranch: main + condition: '' + JobNameSuffix: '' + +jobs: +- job: OneLocBuild${{ parameters.JobNameSuffix }} + + dependsOn: ${{ parameters.dependsOn }} + + displayName: OneLocBuild${{ parameters.JobNameSuffix }} + + variables: + - group: OneLocBuildVariables # Contains the CeapexPat and GithubPat + - name: _GenerateLocProjectArguments + value: -SourcesDirectory ${{ parameters.SourcesDirectory }} + -LanguageSet "${{ parameters.LanguageSet }}" + -CreateNeutralXlfs + - ${{ if eq(parameters.UseCheckedInLocProjectJson, 'true') }}: + - name: _GenerateLocProjectArguments + value: ${{ variables._GenerateLocProjectArguments }} -UseCheckedInLocProjectJson + - template: /eng/common/templates-official/variables/pool-providers.yml + + ${{ if ne(parameters.pool, '') }}: + pool: ${{ parameters.pool }} + ${{ if eq(parameters.pool, '') }}: + pool: + # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) + ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: + name: AzurePipelines-EO + image: 1ESPT-Windows2022 + demands: Cmd + os: windows + # If it's not devdiv, it's dnceng + ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: + name: $(DncEngInternalBuildPool) + image: 1es-windows-2022-pt + os: windows + + steps: + - ${{ if ne(parameters.SkipLocProjectJsonGeneration, 'true') }}: + - task: Powershell@2 + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/generate-locproject.ps1 + arguments: $(_GenerateLocProjectArguments) + displayName: Generate LocProject.json + condition: ${{ parameters.condition }} + + - task: OneLocBuild@2 + displayName: OneLocBuild + env: + SYSTEM_ACCESSTOKEN: $(System.AccessToken) + inputs: + locProj: eng/Localize/LocProject.json + outDir: $(Build.ArtifactStagingDirectory) + lclSource: ${{ parameters.LclSource }} + lclPackageId: ${{ parameters.LclPackageId }} + isCreatePrSelected: ${{ parameters.CreatePr }} + isAutoCompletePrSelected: ${{ parameters.AutoCompletePr }} + ${{ if eq(parameters.CreatePr, true) }}: + isUseLfLineEndingsSelected: ${{ parameters.UseLfLineEndings }} + ${{ if eq(parameters.RepoType, 'gitHub') }}: + isShouldReusePrSelected: ${{ parameters.ReusePr }} + packageSourceAuth: patAuth + patVariable: ${{ parameters.CeapexPat }} + ${{ if eq(parameters.RepoType, 'gitHub') }}: + repoType: ${{ parameters.RepoType }} + gitHubPatVariable: "${{ parameters.GithubPat }}" + ${{ if ne(parameters.MirrorRepo, '') }}: + isMirrorRepoSelected: true + gitHubOrganization: ${{ parameters.GitHubOrg }} + mirrorRepo: ${{ parameters.MirrorRepo }} + mirrorBranch: ${{ parameters.MirrorBranch }} + condition: ${{ parameters.condition }} + + - task: 1ES.PublishBuildArtifacts@1 + displayName: Publish Localization Files + inputs: + PathtoPublish: '$(Build.ArtifactStagingDirectory)/loc' + PublishLocation: Container + ArtifactName: Loc + condition: ${{ parameters.condition }} + + - task: 1ES.PublishBuildArtifacts@1 + displayName: Publish LocProject.json + inputs: + PathtoPublish: '$(Build.SourcesDirectory)/eng/Localize/' + PublishLocation: Container + ArtifactName: Loc + condition: ${{ parameters.condition }} \ No newline at end of file diff --git a/eng/common/templates-official/job/publish-build-assets.yml b/eng/common/templates-official/job/publish-build-assets.yml new file mode 100644 index 00000000000..432dc92ab27 --- /dev/null +++ b/eng/common/templates-official/job/publish-build-assets.yml @@ -0,0 +1,157 @@ +parameters: + configuration: 'Debug' + + # Optional: condition for the job to run + condition: '' + + # Optional: 'true' if future jobs should run even if this job fails + continueOnError: false + + # Optional: dependencies of the job + dependsOn: '' + + # Optional: Include PublishBuildArtifacts task + enablePublishBuildArtifacts: false + + # Optional: A defined YAML pool - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#pool + pool: {} + + # Optional: should run as a public build even in the internal project + # if 'true', the build won't run any of the internal only steps, even if it is running in non-public projects. + runAsPublic: false + + # Optional: whether the build's artifacts will be published using release pipelines or direct feed publishing + publishUsingPipelines: false + + # Optional: whether the build's artifacts will be published using release pipelines or direct feed publishing + publishAssetsImmediately: false + + artifactsPublishingAdditionalParameters: '' + + signingValidationAdditionalParameters: '' + +jobs: +- job: Asset_Registry_Publish + + dependsOn: ${{ parameters.dependsOn }} + timeoutInMinutes: 150 + + ${{ if eq(parameters.publishAssetsImmediately, 'true') }}: + displayName: Publish Assets + ${{ else }}: + displayName: Publish to Build Asset Registry + + variables: + - template: /eng/common/templates-official/variables/pool-providers.yml + - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - group: Publish-Build-Assets + - group: AzureDevOps-Artifact-Feeds-Pats + - name: runCodesignValidationInjection + value: false + # unconditional - needed for logs publishing (redactor tool version) + - template: /eng/common/templates-official/post-build/common-variables.yml + + pool: + # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) + ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: + name: AzurePipelines-EO + image: 1ESPT-WINDOWS2022 + demands: Cmd + os: windows + # If it's not devdiv, it's dnceng + ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: + name: $(DncEngInternalBuildPool) + image: 1es-windows-2022-pt + os: windows + 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: + artifactName: AssetManifests + downloadPath: '$(Build.StagingDirectory)/Download' + checkDownloadedFiles: true + condition: ${{ parameters.condition }} + continueOnError: ${{ parameters.continueOnError }} + + - task: NuGetAuthenticate@1 + + - task: PowerShell@2 + displayName: Publish Build Assets + inputs: + filePath: eng\common\sdk-task.ps1 + arguments: -task PublishBuildAssets -restore -msbuildEngine dotnet + /p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests' + /p:BuildAssetRegistryToken=$(MaestroAccessToken) + /p:MaestroApiEndpoint=https://maestro.dot.net + /p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }} + /p:OfficialBuildId=$(Build.BuildNumber) + condition: ${{ parameters.condition }} + continueOnError: ${{ parameters.continueOnError }} + + - task: powershell@2 + displayName: Create ReleaseConfigs Artifact + inputs: + targetType: inline + script: | + Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value $(BARBuildId) + Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value "$(DefaultChannels)" + Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value $(IsStableBuild) + + - task: 1ES.PublishBuildArtifacts@1 + displayName: Publish ReleaseConfigs Artifact + inputs: + PathtoPublish: '$(Build.StagingDirectory)/ReleaseConfigs.txt' + PublishLocation: Container + ArtifactName: ReleaseConfigs + + - task: powershell@2 + displayName: Check if SymbolPublishingExclusionsFile.txt exists + inputs: + targetType: inline + script: | + $symbolExclusionfile = "$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt" + if(Test-Path -Path $symbolExclusionfile) + { + Write-Host "SymbolExclusionFile exists" + Write-Host "##vso[task.setvariable variable=SymbolExclusionFile]true" + } + else{ + Write-Host "Symbols Exclusion file does not exists" + Write-Host "##vso[task.setvariable variable=SymbolExclusionFile]false" + } + + - task: 1ES.PublishBuildArtifacts@1 + displayName: Publish SymbolPublishingExclusionsFile Artifact + condition: eq(variables['SymbolExclusionFile'], 'true') + inputs: + PathtoPublish: '$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' + PublishLocation: Container + ArtifactName: ReleaseConfigs + + - ${{ if eq(parameters.publishAssetsImmediately, 'true') }}: + - template: /eng/common/templates-official/post-build/setup-maestro-vars.yml + parameters: + BARBuildId: ${{ parameters.BARBuildId }} + PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} + + - task: PowerShell@2 + displayName: Publish Using Darc + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 + arguments: -BuildId $(BARBuildId) + -PublishingInfraVersion 3 + -AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)' + -MaestroToken '$(MaestroApiAccessToken)' + -WaitPublishingFinish true + -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' + -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' + + - ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}: + - template: /eng/common/templates-official/steps/publish-logs.yml + parameters: + JobLabel: 'Publish_Artifacts_Logs' diff --git a/eng/common/templates-official/job/source-build.yml b/eng/common/templates-official/job/source-build.yml new file mode 100644 index 00000000000..50f04e642a3 --- /dev/null +++ b/eng/common/templates-official/job/source-build.yml @@ -0,0 +1,67 @@ +parameters: + # This template adds arcade-powered source-build to CI. The template produces a server job with a + # default ID 'Source_Build_Complete' to put in a dependency list if necessary. + + # Specifies the prefix for source-build jobs added to pipeline. Use this if disambiguation needed. + jobNamePrefix: 'Source_Build' + + # Defines the platform on which to run the job. By default, a linux-x64 machine, suitable for + # managed-only repositories. This is an object with these properties: + # + # name: '' + # The name of the job. This is included in the job ID. + # targetRID: '' + # The name of the target RID to use, instead of the one auto-detected by Arcade. + # nonPortable: false + # Enables non-portable mode. This means a more specific RID (e.g. fedora.32-x64 rather than + # linux-x64), and compiling against distro-provided packages rather than portable ones. + # skipPublishValidation: false + # Disables publishing validation. By default, a check is performed to ensure no packages are + # published by source-build. + # container: '' + # A container to use. Runs in docker. + # pool: {} + # A pool to use. Runs directly on an agent. + # buildScript: '' + # Specifies the build script to invoke to perform the build in the repo. The default + # './build.sh' should work for typical Arcade repositories, but this is customizable for + # difficult situations. + # jobProperties: {} + # A list of job properties to inject at the top level, for potential extensibility beyond + # container and pool. + platform: {} + +jobs: +- job: ${{ parameters.jobNamePrefix }}_${{ parameters.platform.name }} + displayName: Source-Build (${{ parameters.platform.name }}) + + ${{ each property in parameters.platform.jobProperties }}: + ${{ property.key }}: ${{ property.value }} + + ${{ if ne(parameters.platform.container, '') }}: + container: ${{ parameters.platform.container }} + + ${{ if eq(parameters.platform.pool, '') }}: + # The default VM host AzDO pool. This should be capable of running Docker containers: almost all + # source-build builds run in Docker, including the default managed platform. + # /eng/common/templates-official/variables/pool-providers.yml can't be used here (some customers declare variables already), so duplicate its logic + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore-Svc-Public' ), False, 'NetCore-Public')] + demands: ImageOverride -equals build.ubuntu.1804.amd64 + + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')] + image: 1es-mariner-2-pt + os: linux + + ${{ if ne(parameters.platform.pool, '') }}: + pool: ${{ parameters.platform.pool }} + + workspace: + clean: all + + steps: + - template: /eng/common/templates-official/steps/source-build.yml + parameters: + platform: ${{ parameters.platform }} diff --git a/eng/common/templates-official/job/source-index-stage1.yml b/eng/common/templates-official/job/source-index-stage1.yml new file mode 100644 index 00000000000..757af7c7c4f --- /dev/null +++ b/eng/common/templates-official/job/source-index-stage1.yml @@ -0,0 +1,67 @@ +parameters: + runAsPublic: false + 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: [] + binlogPath: artifacts/log/Debug/Build.binlog + condition: '' + dependsOn: '' + pool: '' + +jobs: +- job: SourceIndexStage1 + dependsOn: ${{ parameters.dependsOn }} + condition: ${{ parameters.condition }} + variables: + - name: SourceIndexPackageVersion + value: ${{ parameters.sourceIndexPackageVersion }} + - name: SourceIndexPackageSource + value: ${{ parameters.sourceIndexPackageSource }} + - name: BinlogPath + value: ${{ parameters.binlogPath }} + - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - group: source-dot-net stage1 variables + - template: /eng/common/templates-official/variables/pool-providers.yml + + ${{ if ne(parameters.pool, '') }}: + pool: ${{ parameters.pool }} + ${{ if eq(parameters.pool, '') }}: + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: $(DncEngPublicBuildPool) + image: windows.vs2022.amd64.open + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: $(DncEngInternalBuildPool) + image: windows.vs2022.amd64 + + steps: + - ${{ each preStep in parameters.preSteps }}: + - ${{ preStep }} + + - task: UseDotNet@2 + displayName: Use .NET 8 SDK + inputs: + packageType: sdk + version: 8.0.x + installationPath: $(Agent.TempDirectory)/dotnet + workingDirectory: $(Agent.TempDirectory) + + - script: | + $(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version $(SourceIndexPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools + $(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version $(SourceIndexPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools + displayName: Download Tools + # Set working directory to temp directory so 'dotnet' doesn't try to use global.json and use the repo's sdk. + workingDirectory: $(Agent.TempDirectory) + + - script: ${{ parameters.sourceIndexBuildCommand }} + displayName: Build Repository + + - script: $(Agent.TempDirectory)/.source-index/tools/BinLogToSln -i $(BinlogPath) -r $(Build.SourcesDirectory) -n $(Build.Repository.Name) -o .source-index/stage1output + displayName: Process Binlog into indexable sln + + - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - script: $(Agent.TempDirectory)/.source-index/tools/UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name) + displayName: Upload stage1 artifacts to source index + env: + BLOB_CONTAINER_URL: $(source-dot-net-stage1-blob-container-url) diff --git a/eng/common/templates-official/jobs/codeql-build.yml b/eng/common/templates-official/jobs/codeql-build.yml new file mode 100644 index 00000000000..b68d3c2f319 --- /dev/null +++ b/eng/common/templates-official/jobs/codeql-build.yml @@ -0,0 +1,31 @@ +parameters: + # See schema documentation in /Documentation/AzureDevOps/TemplateSchema.md + continueOnError: false + # Required: A collection of jobs to run - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#job + jobs: [] + # Optional: if specified, restore and use this version of Guardian instead of the default. + overrideGuardianVersion: '' + +jobs: +- template: /eng/common/templates-official/jobs/jobs.yml + parameters: + enableMicrobuild: false + enablePublishBuildArtifacts: false + enablePublishTestResults: false + enablePublishBuildAssets: false + enablePublishUsingPipelines: false + enableTelemetry: true + + variables: + - group: Publish-Build-Assets + # The Guardian version specified in 'eng/common/sdl/packages.config'. This value must be kept in + # sync with the packages.config file. + - name: DefaultGuardianVersion + value: 0.109.0 + - name: GuardianPackagesConfigFile + value: $(Build.SourcesDirectory)\eng\common\sdl\packages.config + - name: GuardianVersion + value: ${{ coalesce(parameters.overrideGuardianVersion, '$(DefaultGuardianVersion)') }} + + jobs: ${{ parameters.jobs }} + diff --git a/eng/common/templates-official/jobs/jobs.yml b/eng/common/templates-official/jobs/jobs.yml new file mode 100644 index 00000000000..857a0f8ba43 --- /dev/null +++ b/eng/common/templates-official/jobs/jobs.yml @@ -0,0 +1,97 @@ +parameters: + # See schema documentation in /Documentation/AzureDevOps/TemplateSchema.md + continueOnError: false + + # Optional: Include PublishBuildArtifacts task + enablePublishBuildArtifacts: false + + # Optional: Enable publishing using release pipelines + enablePublishUsingPipelines: false + + # Optional: Enable running the source-build jobs to build repo from source + enableSourceBuild: false + + # Optional: Parameters for source-build template. + # See /eng/common/templates-official/jobs/source-build.yml for options + sourceBuildParameters: [] + + graphFileGeneration: + # Optional: Enable generating the graph files at the end of the build + enabled: false + # Optional: Include toolset dependencies in the generated graph files + includeToolset: false + + # Required: A collection of jobs to run - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#job + jobs: [] + + # Optional: Override automatically derived dependsOn value for "publish build assets" job + publishBuildAssetsDependsOn: '' + + # Optional: Publish the assets as soon as the publish to BAR stage is complete, rather doing so in a separate stage. + publishAssetsImmediately: false + + # Optional: If using publishAssetsImmediately and additional parameters are needed, can be used to send along additional parameters (normally sent to post-build.yml) + artifactsPublishingAdditionalParameters: '' + signingValidationAdditionalParameters: '' + + # Optional: should run as a public build even in the internal project + # if 'true', the build won't run any of the internal only steps, even if it is running in non-public projects. + runAsPublic: false + + enableSourceIndex: false + sourceIndexParams: {} + +# Internal resources (telemetry, microbuild) can only be accessed from non-public projects, +# and some (Microbuild) should only be applied to non-PR cases for internal builds. + +jobs: +- ${{ each job in parameters.jobs }}: + - template: ../job/job.yml + parameters: + # pass along parameters + ${{ each parameter in parameters }}: + ${{ if ne(parameter.key, 'jobs') }}: + ${{ parameter.key }}: ${{ parameter.value }} + + # pass along job properties + ${{ each property in job }}: + ${{ if ne(property.key, 'job') }}: + ${{ property.key }}: ${{ property.value }} + + name: ${{ job.job }} + +- ${{ if eq(parameters.enableSourceBuild, true) }}: + - template: /eng/common/templates-official/jobs/source-build.yml + parameters: + allCompletedJobId: Source_Build_Complete + ${{ each parameter in parameters.sourceBuildParameters }}: + ${{ parameter.key }}: ${{ parameter.value }} + +- ${{ if eq(parameters.enableSourceIndex, 'true') }}: + - template: ../job/source-index-stage1.yml + parameters: + runAsPublic: ${{ parameters.runAsPublic }} + ${{ each parameter in parameters.sourceIndexParams }}: + ${{ parameter.key }}: ${{ parameter.value }} + +- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - ${{ if or(eq(parameters.enablePublishBuildAssets, true), eq(parameters.artifacts.publish.manifests, 'true'), ne(parameters.artifacts.publish.manifests, '')) }}: + - template: ../job/publish-build-assets.yml + parameters: + continueOnError: ${{ parameters.continueOnError }} + dependsOn: + - ${{ if ne(parameters.publishBuildAssetsDependsOn, '') }}: + - ${{ each job in parameters.publishBuildAssetsDependsOn }}: + - ${{ job.job }} + - ${{ if eq(parameters.publishBuildAssetsDependsOn, '') }}: + - ${{ each job in parameters.jobs }}: + - ${{ job.job }} + - ${{ if eq(parameters.enableSourceBuild, true) }}: + - Source_Build_Complete + + runAsPublic: ${{ parameters.runAsPublic }} + publishUsingPipelines: ${{ parameters.enablePublishUsingPipelines }} + publishAssetsImmediately: ${{ parameters.publishAssetsImmediately }} + enablePublishBuildArtifacts: ${{ parameters.enablePublishBuildArtifacts }} + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + signingValidationAdditionalParameters: ${{ parameters.signingValidationAdditionalParameters }} diff --git a/eng/common/templates-official/jobs/source-build.yml b/eng/common/templates-official/jobs/source-build.yml new file mode 100644 index 00000000000..08e5db9bb11 --- /dev/null +++ b/eng/common/templates-official/jobs/source-build.yml @@ -0,0 +1,46 @@ +parameters: + # This template adds arcade-powered source-build to CI. A job is created for each platform, as + # well as an optional server job that completes when all platform jobs complete. + + # The name of the "join" job for all source-build platforms. If set to empty string, the job is + # not included. Existing repo pipelines can use this job depend on all source-build jobs + # completing without maintaining a separate list of every single job ID: just depend on this one + # server job. By default, not included. Recommended name if used: 'Source_Build_Complete'. + allCompletedJobId: '' + + # See /eng/common/templates-official/job/source-build.yml + jobNamePrefix: 'Source_Build' + + # This is the default platform provided by Arcade, intended for use by a managed-only repo. + defaultManagedPlatform: + name: 'Managed' + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8' + + # Defines the platforms on which to run build jobs. One job is created for each platform, and the + # object in this array is sent to the job template as 'platform'. If no platforms are specified, + # one job runs on 'defaultManagedPlatform'. + platforms: [] + +jobs: + +- ${{ if ne(parameters.allCompletedJobId, '') }}: + - job: ${{ parameters.allCompletedJobId }} + displayName: Source-Build Complete + pool: server + dependsOn: + - ${{ each platform in parameters.platforms }}: + - ${{ parameters.jobNamePrefix }}_${{ platform.name }} + - ${{ if eq(length(parameters.platforms), 0) }}: + - ${{ parameters.jobNamePrefix }}_${{ parameters.defaultManagedPlatform.name }} + +- ${{ each platform in parameters.platforms }}: + - template: /eng/common/templates-official/job/source-build.yml + parameters: + jobNamePrefix: ${{ parameters.jobNamePrefix }} + platform: ${{ platform }} + +- ${{ if eq(length(parameters.platforms), 0) }}: + - template: /eng/common/templates-official/job/source-build.yml + parameters: + jobNamePrefix: ${{ parameters.jobNamePrefix }} + platform: ${{ parameters.defaultManagedPlatform }} diff --git a/eng/common/templates-official/post-build/common-variables.yml b/eng/common/templates-official/post-build/common-variables.yml new file mode 100644 index 00000000000..b9ede10bf09 --- /dev/null +++ b/eng/common/templates-official/post-build/common-variables.yml @@ -0,0 +1,24 @@ +variables: + - group: Publish-Build-Assets + + # Whether the build is internal or not + - name: IsInternalBuild + value: ${{ and(ne(variables['System.TeamProject'], 'public'), contains(variables['Build.SourceBranch'], 'internal')) }} + + # Default Maestro++ API Endpoint and API Version + - name: MaestroApiEndPoint + value: "https://maestro.dot.net" + - name: MaestroApiAccessToken + value: $(MaestroAccessToken) + - name: MaestroApiVersion + value: "2020-02-20" + + - name: SourceLinkCLIVersion + value: 3.0.0 + - name: SymbolToolVersion + value: 1.0.1 + - name: BinlogToolVersion + value: 1.0.11 + + - name: runCodesignValidationInjection + value: false diff --git a/eng/common/templates-official/post-build/post-build.yml b/eng/common/templates-official/post-build/post-build.yml new file mode 100644 index 00000000000..5c98fe1c0f3 --- /dev/null +++ b/eng/common/templates-official/post-build/post-build.yml @@ -0,0 +1,285 @@ +parameters: + # Which publishing infra should be used. THIS SHOULD MATCH THE VERSION ON THE BUILD MANIFEST. + # Publishing V1 is no longer supported + # Publishing V2 is no longer supported + # Publishing V3 is the default + - name: publishingInfraVersion + displayName: Which version of publishing should be used to promote the build definition? + type: number + default: 3 + values: + - 3 + + - name: BARBuildId + displayName: BAR Build Id + type: number + default: 0 + + - name: PromoteToChannelIds + displayName: Channel to promote BARBuildId to + type: string + default: '' + + - name: enableSourceLinkValidation + displayName: Enable SourceLink validation + type: boolean + default: false + + - name: enableSigningValidation + displayName: Enable signing validation + type: boolean + default: true + + - name: enableSymbolValidation + displayName: Enable symbol validation + type: boolean + default: false + + - name: enableNugetValidation + displayName: Enable NuGet validation + type: boolean + default: true + + - name: publishInstallersAndChecksums + displayName: Publish installers and checksums + type: boolean + default: true + + - name: SDLValidationParameters + type: object + default: + enable: false + publishGdn: false + continueOnError: false + params: '' + artifactNames: '' + downloadArtifacts: true + + # These parameters let the user customize the call to sdk-task.ps1 for publishing + # symbols & general artifacts as well as for signing validation + - name: symbolPublishingAdditionalParameters + displayName: Symbol publishing additional parameters + type: string + default: '' + + - name: artifactsPublishingAdditionalParameters + displayName: Artifact publishing additional parameters + type: string + default: '' + + - name: signingValidationAdditionalParameters + displayName: Signing validation additional parameters + type: string + default: '' + + # Which stages should finish execution before post-build stages start + - name: validateDependsOn + type: object + default: + - build + + - name: publishDependsOn + type: object + default: + - Validate + + # Optional: Call asset publishing rather than running in a separate stage + - name: publishAssetsImmediately + type: boolean + default: false + +stages: +- ${{ if or(eq( parameters.enableNugetValidation, 'true'), eq(parameters.enableSigningValidation, 'true'), eq(parameters.enableSourceLinkValidation, 'true'), eq(parameters.SDLValidationParameters.enable, 'true')) }}: + - stage: Validate + dependsOn: ${{ parameters.validateDependsOn }} + displayName: Validate Build Assets + variables: + - template: common-variables.yml + - template: /eng/common/templates-official/variables/pool-providers.yml + jobs: + - job: + displayName: NuGet Validation + condition: and(succeededOrFailed(), eq( ${{ parameters.enableNugetValidation }}, 'true')) + pool: + # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) + ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: + name: AzurePipelines-EO + image: 1ESPT-Windows2022 + demands: Cmd + os: windows + # If it's not devdiv, it's dnceng + ${{ else }}: + name: $(DncEngInternalBuildPool) + image: 1es-windows-2022-pt + os: windows + + steps: + - template: setup-maestro-vars.yml + parameters: + BARBuildId: ${{ parameters.BARBuildId }} + PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} + + - task: DownloadBuildArtifacts@0 + displayName: Download Package Artifacts + inputs: + buildType: specific + buildVersionToDownload: specific + project: $(AzDOProjectName) + pipeline: $(AzDOPipelineId) + buildId: $(AzDOBuildId) + artifactName: PackageArtifacts + checkDownloadedFiles: true + + - task: PowerShell@2 + displayName: Validate + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/post-build/nuget-validation.ps1 + arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ + -ToolDestinationPath $(Agent.BuildDirectory)/Extract/ + + - job: + displayName: Signing Validation + condition: and( eq( ${{ parameters.enableSigningValidation }}, 'true'), ne( variables['PostBuildSign'], 'true')) + pool: + # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) + ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: + name: AzurePipelines-EO + image: 1ESPT-Windows2022 + demands: Cmd + os: windows + # If it's not devdiv, it's dnceng + ${{ else }}: + name: $(DncEngInternalBuildPool) + image: 1es-windows-2022-pt + os: windows + steps: + - template: setup-maestro-vars.yml + parameters: + BARBuildId: ${{ parameters.BARBuildId }} + PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} + + - task: DownloadBuildArtifacts@0 + displayName: Download Package Artifacts + inputs: + buildType: specific + buildVersionToDownload: specific + project: $(AzDOProjectName) + pipeline: $(AzDOPipelineId) + buildId: $(AzDOBuildId) + artifactName: PackageArtifacts + checkDownloadedFiles: true + itemPattern: | + ** + !**/Microsoft.SourceBuild.Intermediate.*.nupkg + + # 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@1 + displayName: 'Authenticate to AzDO Feeds' + + # Signing validation will optionally work with the buildmanifest file which is downloaded from + # Azure DevOps above. + - task: PowerShell@2 + displayName: Validate + inputs: + filePath: eng\common\sdk-task.ps1 + arguments: -task SigningValidation -restore -msbuildEngine vs + /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts' + /p:SignCheckExclusionsFile='$(Build.SourcesDirectory)/eng/SignCheckExclusionsFile.txt' + ${{ parameters.signingValidationAdditionalParameters }} + + - template: ../steps/publish-logs.yml + parameters: + StageLabel: 'Validation' + JobLabel: 'Signing' + BinlogToolVersion: $(BinlogToolVersion) + + - job: + displayName: SourceLink Validation + condition: eq( ${{ parameters.enableSourceLinkValidation }}, 'true') + pool: + # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) + ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: + name: AzurePipelines-EO + image: 1ESPT-Windows2022 + demands: Cmd + os: windows + # If it's not devdiv, it's dnceng + ${{ else }}: + name: $(DncEngInternalBuildPool) + image: 1es-windows-2022-pt + os: windows + steps: + - template: setup-maestro-vars.yml + parameters: + BARBuildId: ${{ parameters.BARBuildId }} + PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} + + - task: DownloadBuildArtifacts@0 + displayName: Download Blob Artifacts + inputs: + buildType: specific + buildVersionToDownload: specific + project: $(AzDOProjectName) + pipeline: $(AzDOPipelineId) + buildId: $(AzDOBuildId) + artifactName: BlobArtifacts + checkDownloadedFiles: true + + - task: PowerShell@2 + displayName: Validate + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/post-build/sourcelink-validation.ps1 + arguments: -InputPath $(Build.ArtifactStagingDirectory)/BlobArtifacts/ + -ExtractPath $(Agent.BuildDirectory)/Extract/ + -GHRepoName $(Build.Repository.Name) + -GHCommit $(Build.SourceVersion) + -SourcelinkCliVersion $(SourceLinkCLIVersion) + continueOnError: true + +- ${{ if ne(parameters.publishAssetsImmediately, 'true') }}: + - stage: publish_using_darc + ${{ if or(eq(parameters.enableNugetValidation, 'true'), eq(parameters.enableSigningValidation, 'true'), eq(parameters.enableSourceLinkValidation, 'true'), eq(parameters.SDLValidationParameters.enable, 'true')) }}: + dependsOn: ${{ parameters.publishDependsOn }} + ${{ else }}: + dependsOn: ${{ parameters.validateDependsOn }} + displayName: Publish using Darc + variables: + - template: common-variables.yml + - template: /eng/common/templates-official/variables/pool-providers.yml + jobs: + - job: + displayName: Publish Using Darc + timeoutInMinutes: 120 + pool: + # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) + ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: + name: AzurePipelines-EO + image: 1ESPT-Windows2022 + demands: Cmd + os: windows + # If it's not devdiv, it's dnceng + ${{ else }}: + name: $(DncEngInternalBuildPool) + image: 1es-windows-2022-pt + os: windows + steps: + - template: setup-maestro-vars.yml + parameters: + BARBuildId: ${{ parameters.BARBuildId }} + PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} + + - task: NuGetAuthenticate@1 + + - task: PowerShell@2 + displayName: Publish Using Darc + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 + arguments: -BuildId $(BARBuildId) + -PublishingInfraVersion ${{ parameters.publishingInfraVersion }} + -AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)' + -MaestroToken '$(MaestroApiAccessToken)' + -WaitPublishingFinish true + -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' + -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' diff --git a/eng/common/templates-official/post-build/setup-maestro-vars.yml b/eng/common/templates-official/post-build/setup-maestro-vars.yml new file mode 100644 index 00000000000..0c87f149a4a --- /dev/null +++ b/eng/common/templates-official/post-build/setup-maestro-vars.yml @@ -0,0 +1,70 @@ +parameters: + BARBuildId: '' + PromoteToChannelIds: '' + +steps: + - ${{ if eq(coalesce(parameters.PromoteToChannelIds, 0), 0) }}: + - task: DownloadBuildArtifacts@0 + displayName: Download Release Configs + inputs: + buildType: current + artifactName: ReleaseConfigs + checkDownloadedFiles: true + + - task: PowerShell@2 + name: setReleaseVars + displayName: Set Release Configs Vars + inputs: + targetType: inline + pwsh: true + script: | + try { + if (!$Env:PromoteToMaestroChannels -or $Env:PromoteToMaestroChannels.Trim() -eq '') { + $Content = Get-Content $(Build.StagingDirectory)/ReleaseConfigs/ReleaseConfigs.txt + + $BarId = $Content | Select -Index 0 + $Channels = $Content | Select -Index 1 + $IsStableBuild = $Content | Select -Index 2 + + $AzureDevOpsProject = $Env:System_TeamProject + $AzureDevOpsBuildDefinitionId = $Env:System_DefinitionId + $AzureDevOpsBuildId = $Env:Build_BuildId + } + else { + $buildApiEndpoint = "${Env:MaestroApiEndPoint}/api/builds/${Env:BARBuildId}?api-version=${Env:MaestroApiVersion}" + + $apiHeaders = New-Object 'System.Collections.Generic.Dictionary[[String],[String]]' + $apiHeaders.Add('Accept', 'application/json') + $apiHeaders.Add('Authorization',"Bearer ${Env:MAESTRO_API_TOKEN}") + + $buildInfo = try { Invoke-WebRequest -Method Get -Uri $buildApiEndpoint -Headers $apiHeaders | ConvertFrom-Json } catch { Write-Host "Error: $_" } + + $BarId = $Env:BARBuildId + $Channels = $Env:PromoteToMaestroChannels -split "," + $Channels = $Channels -join "][" + $Channels = "[$Channels]" + + $IsStableBuild = $buildInfo.stable + $AzureDevOpsProject = $buildInfo.azureDevOpsProject + $AzureDevOpsBuildDefinitionId = $buildInfo.azureDevOpsBuildDefinitionId + $AzureDevOpsBuildId = $buildInfo.azureDevOpsBuildId + } + + Write-Host "##vso[task.setvariable variable=BARBuildId]$BarId" + Write-Host "##vso[task.setvariable variable=TargetChannels]$Channels" + Write-Host "##vso[task.setvariable variable=IsStableBuild]$IsStableBuild" + + Write-Host "##vso[task.setvariable variable=AzDOProjectName]$AzureDevOpsProject" + Write-Host "##vso[task.setvariable variable=AzDOPipelineId]$AzureDevOpsBuildDefinitionId" + Write-Host "##vso[task.setvariable variable=AzDOBuildId]$AzureDevOpsBuildId" + } + catch { + Write-Host $_ + Write-Host $_.Exception + Write-Host $_.ScriptStackTrace + exit 1 + } + env: + MAESTRO_API_TOKEN: $(MaestroApiAccessToken) + BARBuildId: ${{ parameters.BARBuildId }} + PromoteToMaestroChannels: ${{ parameters.PromoteToChannelIds }} diff --git a/eng/common/templates-official/post-build/trigger-subscription.yml b/eng/common/templates-official/post-build/trigger-subscription.yml new file mode 100644 index 00000000000..da669030daf --- /dev/null +++ b/eng/common/templates-official/post-build/trigger-subscription.yml @@ -0,0 +1,13 @@ +parameters: + ChannelId: 0 + +steps: +- task: PowerShell@2 + displayName: Triggering subscriptions + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/post-build/trigger-subscriptions.ps1 + arguments: -SourceRepo $(Build.Repository.Uri) + -ChannelId ${{ parameters.ChannelId }} + -MaestroApiAccessToken $(MaestroAccessToken) + -MaestroApiEndPoint $(MaestroApiEndPoint) + -MaestroApiVersion $(MaestroApiVersion) diff --git a/eng/common/templates-official/steps/add-build-to-channel.yml b/eng/common/templates-official/steps/add-build-to-channel.yml new file mode 100644 index 00000000000..f67a210d62f --- /dev/null +++ b/eng/common/templates-official/steps/add-build-to-channel.yml @@ -0,0 +1,13 @@ +parameters: + ChannelId: 0 + +steps: +- task: PowerShell@2 + displayName: Add Build to Channel + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/post-build/add-build-to-channel.ps1 + arguments: -BuildId $(BARBuildId) + -ChannelId ${{ parameters.ChannelId }} + -MaestroApiAccessToken $(MaestroApiAccessToken) + -MaestroApiEndPoint $(MaestroApiEndPoint) + -MaestroApiVersion $(MaestroApiVersion) diff --git a/eng/common/templates-official/steps/component-governance.yml b/eng/common/templates-official/steps/component-governance.yml new file mode 100644 index 00000000000..0ecec47b0c9 --- /dev/null +++ b/eng/common/templates-official/steps/component-governance.yml @@ -0,0 +1,13 @@ +parameters: + disableComponentGovernance: false + componentGovernanceIgnoreDirectories: '' + +steps: +- ${{ if eq(parameters.disableComponentGovernance, 'true') }}: + - script: "echo ##vso[task.setvariable variable=skipComponentGovernanceDetection]true" + displayName: Set skipComponentGovernanceDetection variable +- ${{ if ne(parameters.disableComponentGovernance, 'true') }}: + - task: ComponentGovernanceComponentDetection@0 + continueOnError: true + inputs: + ignoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }} \ No newline at end of file diff --git a/eng/common/templates-official/steps/generate-sbom.yml b/eng/common/templates-official/steps/generate-sbom.yml new file mode 100644 index 00000000000..488b560e8ba --- /dev/null +++ b/eng/common/templates-official/steps/generate-sbom.yml @@ -0,0 +1,48 @@ +# BuildDropPath - The root folder of the drop directory for which the manifest file will be generated. +# PackageName - The name of the package this SBOM represents. +# PackageVersion - The version of the package this SBOM represents. +# ManifestDirPath - The path of the directory where the generated manifest files will be placed +# IgnoreDirectories - Directories to ignore for SBOM generation. This will be passed through to the CG component detector. + +parameters: + PackageVersion: 7.0.0 + BuildDropPath: '$(Build.SourcesDirectory)/artifacts' + PackageName: '.NET' + ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom + IgnoreDirectories: '' + sbomContinueOnError: true + +steps: +- task: PowerShell@2 + displayName: Prep for SBOM generation in (Non-linux) + condition: or(eq(variables['Agent.Os'], 'Windows_NT'), eq(variables['Agent.Os'], 'Darwin')) + inputs: + filePath: ./eng/common/generate-sbom-prep.ps1 + arguments: ${{parameters.manifestDirPath}} + +# Chmodding is a workaround for https://github.com/dotnet/arcade/issues/8461 +- script: | + chmod +x ./eng/common/generate-sbom-prep.sh + ./eng/common/generate-sbom-prep.sh ${{parameters.manifestDirPath}} + displayName: Prep for SBOM generation in (Linux) + condition: eq(variables['Agent.Os'], 'Linux') + continueOnError: ${{ parameters.sbomContinueOnError }} + +- task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0 + displayName: 'Generate SBOM manifest' + continueOnError: ${{ parameters.sbomContinueOnError }} + inputs: + PackageName: ${{ parameters.packageName }} + BuildDropPath: ${{ parameters.buildDropPath }} + PackageVersion: ${{ parameters.packageVersion }} + ManifestDirPath: ${{ parameters.manifestDirPath }} + ${{ if ne(parameters.IgnoreDirectories, '') }}: + AdditionalComponentDetectorArgs: '--IgnoreDirectories ${{ parameters.IgnoreDirectories }}' + +- task: 1ES.PublishPipelineArtifact@1 + displayName: Publish SBOM manifest + continueOnError: ${{parameters.sbomContinueOnError}} + inputs: + targetPath: '${{parameters.manifestDirPath}}' + artifactName: $(ARTIFACT_NAME) + diff --git a/eng/common/templates-official/steps/publish-logs.yml b/eng/common/templates-official/steps/publish-logs.yml new file mode 100644 index 00000000000..84b2f559c56 --- /dev/null +++ b/eng/common/templates-official/steps/publish-logs.yml @@ -0,0 +1,49 @@ +parameters: + StageLabel: '' + JobLabel: '' + CustomSensitiveDataList: '' + # A default - in case value from eng/common/templates-official/post-build/common-variables.yml is not passed + BinlogToolVersion: '1.0.11' + +steps: +- task: Powershell@2 + displayName: Prepare Binlogs to Upload + inputs: + targetType: inline + script: | + New-Item -ItemType Directory $(Build.SourcesDirectory)/PostBuildLogs/${{parameters.StageLabel}}/${{parameters.JobLabel}}/ + 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() + +- task: 1ES.PublishBuildArtifacts@1 + displayName: Publish Logs + inputs: + PathtoPublish: '$(Build.SourcesDirectory)/PostBuildLogs' + PublishLocation: Container + ArtifactName: PostBuildLogs + continueOnError: true + condition: always() diff --git a/eng/common/templates-official/steps/retain-build.yml b/eng/common/templates-official/steps/retain-build.yml new file mode 100644 index 00000000000..83d97a26a01 --- /dev/null +++ b/eng/common/templates-official/steps/retain-build.yml @@ -0,0 +1,28 @@ +parameters: + # Optional azure devops PAT with build execute permissions for the build's organization, + # only needed if the build that should be retained ran on a different organization than + # the pipeline where this template is executing from + Token: '' + # Optional BuildId to retain, defaults to the current running build + BuildId: '' + # Azure devops Organization URI for the build in the https://dev.azure.com/ format. + # Defaults to the organization the current pipeline is running on + AzdoOrgUri: '$(System.CollectionUri)' + # Azure devops project for the build. Defaults to the project the current pipeline is running on + AzdoProject: '$(System.TeamProject)' + +steps: + - task: powershell@2 + inputs: + targetType: 'filePath' + filePath: eng/common/retain-build.ps1 + pwsh: true + arguments: > + -AzdoOrgUri: ${{parameters.AzdoOrgUri}} + -AzdoProject ${{parameters.AzdoProject}} + -Token ${{coalesce(parameters.Token, '$env:SYSTEM_ACCESSTOKEN') }} + -BuildId ${{coalesce(parameters.BuildId, '$env:BUILD_ID')}} + displayName: Enable permanent build retention + env: + SYSTEM_ACCESSTOKEN: $(System.AccessToken) + BUILD_ID: $(Build.BuildId) \ No newline at end of file diff --git a/eng/common/templates-official/steps/send-to-helix.yml b/eng/common/templates-official/steps/send-to-helix.yml new file mode 100644 index 00000000000..3eb7e2d5f84 --- /dev/null +++ b/eng/common/templates-official/steps/send-to-helix.yml @@ -0,0 +1,91 @@ +# Please remember to update the documentation if you make changes to these parameters! +parameters: + HelixSource: 'pr/default' # required -- sources must start with pr/, official/, prodcon/, or agent/ + HelixType: 'tests/default/' # required -- Helix telemetry which identifies what type of data this is; should include "test" for clarity and must end in '/' + HelixBuild: $(Build.BuildNumber) # required -- the build number Helix will use to identify this -- automatically set to the AzDO build number + HelixTargetQueues: '' # required -- semicolon-delimited list of Helix queues to test on; see https://helix.dot.net/ for a list of queues + HelixAccessToken: '' # required -- access token to make Helix API requests; should be provided by the appropriate variable group + HelixConfiguration: '' # optional -- additional property attached to a job + HelixPreCommands: '' # optional -- commands to run before Helix work item execution + HelixPostCommands: '' # optional -- commands to run after Helix work item execution + WorkItemDirectory: '' # optional -- a payload directory to zip up and send to Helix; requires WorkItemCommand; incompatible with XUnitProjects + WorkItemCommand: '' # optional -- a command to execute on the payload; requires WorkItemDirectory; incompatible with XUnitProjects + WorkItemTimeout: '' # optional -- a timeout in TimeSpan.Parse-ready value (e.g. 00:02:00) for the work item command; requires WorkItemDirectory; incompatible with XUnitProjects + CorrelationPayloadDirectory: '' # optional -- a directory to zip up and send to Helix as a correlation payload + XUnitProjects: '' # optional -- semicolon-delimited list of XUnitProjects to parse and send to Helix; requires XUnitRuntimeTargetFramework, XUnitPublishTargetFramework, XUnitRunnerVersion, and IncludeDotNetCli=true + XUnitWorkItemTimeout: '' # optional -- the workitem timeout in seconds for all workitems created from the xUnit projects specified by XUnitProjects + XUnitPublishTargetFramework: '' # optional -- framework to use to publish your xUnit projects + XUnitRuntimeTargetFramework: '' # optional -- framework to use for the xUnit console runner + XUnitRunnerVersion: '' # optional -- version of the xUnit nuget package you wish to use on Helix; required for XUnitProjects + IncludeDotNetCli: false # optional -- true will download a version of the .NET CLI onto the Helix machine as a correlation payload; requires DotNetCliPackageType and DotNetCliVersion + DotNetCliPackageType: '' # optional -- either 'sdk', 'runtime' or 'aspnetcore-runtime'; determines whether the sdk or runtime will be sent to Helix; see https://raw.githubusercontent.com/dotnet/core/main/release-notes/releases-index.json + DotNetCliVersion: '' # optional -- version of the CLI to send to Helix; based on this: https://raw.githubusercontent.com/dotnet/core/main/release-notes/releases-index.json + WaitForWorkItemCompletion: true # optional -- true will make the task wait until work items have been completed and fail the build if work items fail. False is "fire and forget." + IsExternal: false # [DEPRECATED] -- doesn't do anything, jobs are external if HelixAccessToken is empty and Creator is set + HelixBaseUri: 'https://helix.dot.net/' # optional -- sets the Helix API base URI (allows targeting https://helix.int-dot.net ) + Creator: '' # optional -- if the build is external, use this to specify who is sending the job + DisplayNamePrefix: 'Run Tests' # optional -- rename the beginning of the displayName of the steps in AzDO + condition: succeeded() # optional -- condition for step to execute; defaults to succeeded() + continueOnError: false # optional -- determines whether to continue the build if the step errors; defaults to false + +steps: + - powershell: 'powershell "$env:BUILD_SOURCESDIRECTORY\eng\common\msbuild.ps1 $env:BUILD_SOURCESDIRECTORY\eng\common\helixpublish.proj /restore /p:TreatWarningsAsErrors=false /t:Test /bl:$env:BUILD_SOURCESDIRECTORY\artifacts\log\$env:BuildConfig\SendToHelix.binlog"' + displayName: ${{ parameters.DisplayNamePrefix }} (Windows) + env: + BuildConfig: $(_BuildConfig) + HelixSource: ${{ parameters.HelixSource }} + HelixType: ${{ parameters.HelixType }} + HelixBuild: ${{ parameters.HelixBuild }} + HelixConfiguration: ${{ parameters.HelixConfiguration }} + HelixTargetQueues: ${{ parameters.HelixTargetQueues }} + HelixAccessToken: ${{ parameters.HelixAccessToken }} + HelixPreCommands: ${{ parameters.HelixPreCommands }} + HelixPostCommands: ${{ parameters.HelixPostCommands }} + WorkItemDirectory: ${{ parameters.WorkItemDirectory }} + WorkItemCommand: ${{ parameters.WorkItemCommand }} + WorkItemTimeout: ${{ parameters.WorkItemTimeout }} + CorrelationPayloadDirectory: ${{ parameters.CorrelationPayloadDirectory }} + XUnitProjects: ${{ parameters.XUnitProjects }} + XUnitWorkItemTimeout: ${{ parameters.XUnitWorkItemTimeout }} + XUnitPublishTargetFramework: ${{ parameters.XUnitPublishTargetFramework }} + XUnitRuntimeTargetFramework: ${{ parameters.XUnitRuntimeTargetFramework }} + XUnitRunnerVersion: ${{ parameters.XUnitRunnerVersion }} + IncludeDotNetCli: ${{ parameters.IncludeDotNetCli }} + DotNetCliPackageType: ${{ parameters.DotNetCliPackageType }} + DotNetCliVersion: ${{ parameters.DotNetCliVersion }} + WaitForWorkItemCompletion: ${{ parameters.WaitForWorkItemCompletion }} + HelixBaseUri: ${{ parameters.HelixBaseUri }} + Creator: ${{ parameters.Creator }} + SYSTEM_ACCESSTOKEN: $(System.AccessToken) + condition: and(${{ parameters.condition }}, eq(variables['Agent.Os'], 'Windows_NT')) + continueOnError: ${{ parameters.continueOnError }} + - script: $BUILD_SOURCESDIRECTORY/eng/common/msbuild.sh $BUILD_SOURCESDIRECTORY/eng/common/helixpublish.proj /restore /p:TreatWarningsAsErrors=false /t:Test /bl:$BUILD_SOURCESDIRECTORY/artifacts/log/$BuildConfig/SendToHelix.binlog + displayName: ${{ parameters.DisplayNamePrefix }} (Unix) + env: + BuildConfig: $(_BuildConfig) + HelixSource: ${{ parameters.HelixSource }} + HelixType: ${{ parameters.HelixType }} + HelixBuild: ${{ parameters.HelixBuild }} + HelixConfiguration: ${{ parameters.HelixConfiguration }} + HelixTargetQueues: ${{ parameters.HelixTargetQueues }} + HelixAccessToken: ${{ parameters.HelixAccessToken }} + HelixPreCommands: ${{ parameters.HelixPreCommands }} + HelixPostCommands: ${{ parameters.HelixPostCommands }} + WorkItemDirectory: ${{ parameters.WorkItemDirectory }} + WorkItemCommand: ${{ parameters.WorkItemCommand }} + WorkItemTimeout: ${{ parameters.WorkItemTimeout }} + CorrelationPayloadDirectory: ${{ parameters.CorrelationPayloadDirectory }} + XUnitProjects: ${{ parameters.XUnitProjects }} + XUnitWorkItemTimeout: ${{ parameters.XUnitWorkItemTimeout }} + XUnitPublishTargetFramework: ${{ parameters.XUnitPublishTargetFramework }} + XUnitRuntimeTargetFramework: ${{ parameters.XUnitRuntimeTargetFramework }} + XUnitRunnerVersion: ${{ parameters.XUnitRunnerVersion }} + IncludeDotNetCli: ${{ parameters.IncludeDotNetCli }} + DotNetCliPackageType: ${{ parameters.DotNetCliPackageType }} + DotNetCliVersion: ${{ parameters.DotNetCliVersion }} + WaitForWorkItemCompletion: ${{ parameters.WaitForWorkItemCompletion }} + HelixBaseUri: ${{ parameters.HelixBaseUri }} + Creator: ${{ parameters.Creator }} + SYSTEM_ACCESSTOKEN: $(System.AccessToken) + condition: and(${{ parameters.condition }}, ne(variables['Agent.Os'], 'Windows_NT')) + continueOnError: ${{ parameters.continueOnError }} diff --git a/eng/common/templates-official/steps/source-build.yml b/eng/common/templates-official/steps/source-build.yml new file mode 100644 index 00000000000..b1db70842f5 --- /dev/null +++ b/eng/common/templates-official/steps/source-build.yml @@ -0,0 +1,129 @@ +parameters: + # This template adds arcade-powered source-build to CI. + + # This is a 'steps' template, and is intended for advanced scenarios where the existing build + # infra has a careful build methodology that must be followed. For example, a repo + # (dotnet/runtime) might choose to clone the GitHub repo only once and store it as a pipeline + # artifact for all subsequent jobs to use, to reduce dependence on a strong network connection to + # GitHub. Using this steps template leaves room for that infra to be included. + + # Defines the platform on which to run the steps. See 'eng/common/templates-official/job/source-build.yml' + # for details. The entire object is described in the 'job' template for simplicity, even though + # the usage of the properties on this object is split between the 'job' and 'steps' templates. + platform: {} + +steps: +# Build. Keep it self-contained for simple reusability. (No source-build-specific job variables.) +- script: | + set -x + df -h + + # If building on the internal project, the artifact feeds variable may be available (usually only if needed) + # In that case, call the feed setup script to add internal feeds corresponding to public ones. + # In addition, add an msbuild argument to copy the WIP from the repo to the target build location. + # This is because SetupNuGetSources.sh will alter the current NuGet.config file, and we need to preserve those + # changes. + internalRestoreArgs= + if [ '$(dn-bot-dnceng-artifact-feeds-rw)' != '$''(dn-bot-dnceng-artifact-feeds-rw)' ]; then + # Temporarily work around https://github.com/dotnet/arcade/issues/7709 + chmod +x $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh + $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh $(Build.SourcesDirectory)/NuGet.config $(dn-bot-dnceng-artifact-feeds-rw) + internalRestoreArgs='/p:CopyWipIntoInnerSourceBuildRepo=true' + + # The 'Copy WIP' feature of source build uses git stash to apply changes from the original repo. + # This only works if there is a username/email configured, which won't be the case in most CI runs. + git config --get user.email + if [ $? -ne 0 ]; then + git config user.email dn-bot@microsoft.com + git config user.name dn-bot + fi + fi + + # If building on the internal project, the internal storage variable may be available (usually only if needed) + # In that case, add variables to allow the download of internal runtimes if the specified versions are not found + # in the default public locations. + internalRuntimeDownloadArgs= + if [ '$(dotnetbuilds-internal-container-read-token-base64)' != '$''(dotnetbuilds-internal-container-read-token-base64)' ]; then + internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) --runtimesourcefeed https://dotnetbuilds.blob.core.windows.net/internal --runtimesourcefeedkey $(dotnetbuilds-internal-container-read-token-base64)' + fi + + buildConfig=Release + # Check if AzDO substitutes in a build config from a variable, and use it if so. + if [ '$(_BuildConfig)' != '$''(_BuildConfig)' ]; then + buildConfig='$(_BuildConfig)' + fi + + officialBuildArgs= + if [ '${{ and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}' = 'True' ]; then + officialBuildArgs='/p:DotNetPublishUsingPipelines=true /p:OfficialBuildId=$(BUILD.BUILDNUMBER)' + fi + + targetRidArgs= + if [ '${{ parameters.platform.targetRID }}' != '' ]; then + targetRidArgs='/p:TargetRid=${{ parameters.platform.targetRID }}' + fi + + runtimeOsArgs= + if [ '${{ parameters.platform.runtimeOS }}' != '' ]; then + runtimeOsArgs='/p:RuntimeOS=${{ parameters.platform.runtimeOS }}' + fi + + baseOsArgs= + if [ '${{ parameters.platform.baseOS }}' != '' ]; then + baseOsArgs='/p:BaseOS=${{ parameters.platform.baseOS }}' + fi + + publishArgs= + if [ '${{ parameters.platform.skipPublishValidation }}' != 'true' ]; then + publishArgs='--publish' + fi + + assetManifestFileName=SourceBuild_RidSpecific.xml + if [ '${{ parameters.platform.name }}' != '' ]; then + assetManifestFileName=SourceBuild_${{ parameters.platform.name }}.xml + fi + + ${{ coalesce(parameters.platform.buildScript, './build.sh') }} --ci \ + --configuration $buildConfig \ + --restore --build --pack $publishArgs -bl \ + $officialBuildArgs \ + $internalRuntimeDownloadArgs \ + $internalRestoreArgs \ + $targetRidArgs \ + $runtimeOsArgs \ + $baseOsArgs \ + /p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \ + /p:ArcadeBuildFromSource=true \ + /p:AssetManifestFileName=$assetManifestFileName + displayName: Build + +# Upload build logs for diagnosis. +- task: CopyFiles@2 + displayName: Prepare BuildLogs staging directory + inputs: + SourceFolder: '$(Build.SourcesDirectory)' + Contents: | + **/*.log + **/*.binlog + artifacts/sb/prebuilt-report/** + TargetFolder: '$(Build.StagingDirectory)/BuildLogs' + CleanTargetFolder: true + continueOnError: true + condition: succeededOrFailed() + +- task: 1ES.PublishPipelineArtifact@1 + displayName: Publish BuildLogs + inputs: + targetPath: '$(Build.StagingDirectory)/BuildLogs' + artifactName: BuildLogs_SourceBuild_${{ parameters.platform.name }}_Attempt$(System.JobAttempt) + continueOnError: true + condition: succeededOrFailed() + +# Manually inject component detection so that we can ignore the source build upstream cache, which contains +# a nupkg cache of input packages (a local feed). +# This path must match the upstream cache path in property 'CurrentRepoSourceBuiltNupkgCacheDir' +# in src\Microsoft.DotNet.Arcade.Sdk\tools\SourceBuild\SourceBuildArcade.targets +- task: ComponentGovernanceComponentDetection@0 + displayName: Component Detection (Exclude upstream cache) + inputs: + ignoreDirectories: '$(Build.SourcesDirectory)/artifacts/sb/src/artifacts/obj/source-built-upstream-cache' diff --git a/eng/common/templates-official/variables/pool-providers.yml b/eng/common/templates-official/variables/pool-providers.yml new file mode 100644 index 00000000000..beab7d1bfba --- /dev/null +++ b/eng/common/templates-official/variables/pool-providers.yml @@ -0,0 +1,45 @@ +# Select a pool provider based off branch name. Anything with branch name containing 'release' must go into an -Svc pool, +# otherwise it should go into the "normal" pools. This separates out the queueing and billing of released branches. + +# Motivation: +# Once a given branch of a repository's output has been officially "shipped" once, it is then considered to be COGS +# (Cost of goods sold) and should be moved to a servicing pool provider. This allows both separation of queueing +# (allowing release builds and main PR builds to not intefere with each other) and billing (required for COGS. +# Additionally, the pool provider name itself may be subject to change when the .NET Core Engineering Services +# team needs to move resources around and create new and potentially differently-named pools. Using this template +# file from an Arcade-ified repo helps guard against both having to update one's release/* branches and renaming. + +# How to use: +# This yaml assumes your shipped product branches use the naming convention "release/..." (which many do). +# If we find alternate naming conventions in broad usage it can be added to the condition below. +# +# First, import the template in an arcade-ified repo to pick up the variables, e.g.: +# +# variables: +# - template: /eng/common/templates-official/variables/pool-providers.yml +# +# ... then anywhere specifying the pool provider use the runtime variables, +# $(DncEngInternalBuildPool) +# +# pool: +# name: $(DncEngInternalBuildPool) +# image: 1es-windows-2022-pt + +variables: + # Coalesce the target and source branches so we know when a PR targets a release branch + # If these variables are somehow missing, fall back to main (tends to have more capacity) + + # Any new -Svc alternative pools should have variables added here to allow for splitting work + + - name: DncEngInternalBuildPool + value: $[ + replace( + replace( + eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), + True, + 'NetCore1ESPool-Svc-Internal' + ), + False, + 'NetCore1ESPool-Internal' + ) + ] \ No newline at end of file diff --git a/eng/common/templates-official/variables/sdl-variables.yml b/eng/common/templates-official/variables/sdl-variables.yml new file mode 100644 index 00000000000..dbdd66d4a4b --- /dev/null +++ b/eng/common/templates-official/variables/sdl-variables.yml @@ -0,0 +1,7 @@ +variables: +# The Guardian version specified in 'eng/common/sdl/packages.config'. This value must be kept in +# sync with the packages.config file. +- name: DefaultGuardianVersion + value: 0.109.0 +- name: GuardianPackagesConfigFile + value: $(Build.SourcesDirectory)\eng\common\sdl\packages.config \ No newline at end of file diff --git a/global.json b/global.json index 244b590d679..845141406aa 100644 --- a/global.json +++ b/global.json @@ -31,7 +31,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24128.1", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24128.1" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24151.1", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24151.1" } } From 7c060fecfa5d59484dbf3a37ad84aa7ae62a89e0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 2 Mar 2024 15:10:09 +0000 Subject: [PATCH 083/568] Update dependencies from https://github.com/dotnet/diagnostics build 20240301.1 (#6164) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 79c856e9031..141e45febbe 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,11 +4,11 @@ https://github.com/dotnet/aspnetcore 7874b36fd8da2f8e56b23aac48954f14bafba1fe - + https://github.com/dotnet/diagnostics 831eee3a9e69dd886fa190a9914a7f66260c653a - + https://github.com/dotnet/diagnostics 831eee3a9e69dd886fa190a9914a7f66260c653a diff --git a/eng/Versions.props b/eng/Versions.props index 170439603bf..9f517c5332c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24126.1 - 8.0.0-preview.24129.1 - 8.0.0-preview.24129.1 + 8.0.0-preview.24151.1 + 8.0.0-preview.24151.1 9.0.100-preview.3.24129.12 From 1b90490a79faba491367abfd5d84478e0aca0a7f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 4 Mar 2024 08:43:03 -0800 Subject: [PATCH 084/568] [feature/9.x] Update dependencies from dotnet/installer (#6167) * Update dependencies from https://github.com/dotnet/installer build 20240301.6 Microsoft.Dotnet.Sdk.Internal From Version 9.0.100-preview.3.24129.12 -> To Version 9.0.100-preview.3.24151.6 * Update dependencies from https://github.com/dotnet/installer build 20240301.6 Microsoft.Dotnet.Sdk.Internal From Version 9.0.100-preview.3.24129.12 -> To Version 9.0.100-preview.3.24151.6 * Update dependencies from https://github.com/dotnet/installer build 20240303.2 Microsoft.Dotnet.Sdk.Internal From Version 9.0.100-preview.3.24129.12 -> To Version 9.0.100-preview.3.24153.2 Dependency coherency updates Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0 From Version 9.0.0-preview.3.24129.1 -> To Version 9.0.0-preview.3.24151.1 (parent: Microsoft.Dotnet.Sdk.Internal --------- Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 141e45febbe..9e0570a2793 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/aspnetcore - 7874b36fd8da2f8e56b23aac48954f14bafba1fe + 3e5155276f3d486ef49e1f06ee875d6757983695 https://github.com/dotnet/diagnostics @@ -38,9 +38,9 @@ https://github.com/dotnet/arcade d4a7b37f268cb5fe89f4472ef5341629cd040dfe - + https://github.com/dotnet/installer - 001946486060e31dffa0f82a68c4db582c353af0 + 893b762b6e36d558df7ae6fccdfd8034f83a1c2e https://github.com/dotnet/arcade @@ -54,9 +54,9 @@ https://github.com/dotnet/runtime 5e603d595e63ddc5cdce9777a40608279abdcc37 - + https://github.com/dotnet/aspnetcore - 7874b36fd8da2f8e56b23aac48954f14bafba1fe + 3e5155276f3d486ef49e1f06ee875d6757983695 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 9f517c5332c..0e67716609f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,15 +52,15 @@ 9.0.0-beta.24151.1 9.0.0-beta.24151.1 - 9.0.0-preview.3.24129.1 - 9.0.0-preview.3.24129.1 + 9.0.0-preview.3.24151.1 + 9.0.0-preview.3.24151.1 2.0.0-beta4.24126.1 8.0.0-preview.24151.1 8.0.0-preview.24151.1 - 9.0.100-preview.3.24129.12 + 9.0.100-preview.3.24153.2 9.0.0-preview.24151.1 From 26aafad0806d18c4eac1c02be7a686ac74ffa787 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 4 Mar 2024 08:43:29 -0800 Subject: [PATCH 085/568] [feature/9.x] Update dependencies from dotnet/arcade (#6165) * Update dependencies from https://github.com/dotnet/arcade build 20240301.5 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.24151.1 -> To Version 9.0.0-beta.24151.5 * Update dependencies from https://github.com/dotnet/arcade build 20240301.5 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.24151.1 -> To Version 9.0.0-beta.24151.5 * Update dependencies from https://github.com/dotnet/arcade build 20240301.5 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.24151.1 -> To Version 9.0.0-beta.24151.5 --------- Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 20 +++++++++---------- eng/Versions.props | 6 +++--- .../job/publish-build-assets.yml | 2 +- global.json | 4 ++-- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9e0570a2793..bb0f45a56e2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,29 +22,29 @@ https://github.com/dotnet/roslyn-analyzers 59b2d9dc38fcc17dd618e3b3af3ce692aaeedb37 - + https://github.com/dotnet/arcade - d4a7b37f268cb5fe89f4472ef5341629cd040dfe + 87d89025bdd8827c016e4083660d31f497670e5c - + https://github.com/dotnet/arcade - d4a7b37f268cb5fe89f4472ef5341629cd040dfe + 87d89025bdd8827c016e4083660d31f497670e5c - + https://github.com/dotnet/arcade - d4a7b37f268cb5fe89f4472ef5341629cd040dfe + 87d89025bdd8827c016e4083660d31f497670e5c - + https://github.com/dotnet/arcade - d4a7b37f268cb5fe89f4472ef5341629cd040dfe + 87d89025bdd8827c016e4083660d31f497670e5c https://github.com/dotnet/installer 893b762b6e36d558df7ae6fccdfd8034f83a1c2e - + https://github.com/dotnet/arcade - d4a7b37f268cb5fe89f4472ef5341629cd040dfe + 87d89025bdd8827c016e4083660d31f497670e5c https://github.com/dotnet/symstore diff --git a/eng/Versions.props b/eng/Versions.props index 0e67716609f..dacf34b8f28 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,9 +48,9 @@ --> - 9.0.0-beta.24151.1 - 9.0.0-beta.24151.1 - 9.0.0-beta.24151.1 + 9.0.0-beta.24151.5 + 9.0.0-beta.24151.5 + 9.0.0-beta.24151.5 9.0.0-preview.3.24151.1 9.0.0-preview.3.24151.1 diff --git a/eng/common/templates-official/job/publish-build-assets.yml b/eng/common/templates-official/job/publish-build-assets.yml index 432dc92ab27..5f54135569b 100644 --- a/eng/common/templates-official/job/publish-build-assets.yml +++ b/eng/common/templates-official/job/publish-build-assets.yml @@ -55,7 +55,7 @@ jobs: # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: name: AzurePipelines-EO - image: 1ESPT-WINDOWS2022 + image: 1ESPT-Windows2022 demands: Cmd os: windows # If it's not devdiv, it's dnceng diff --git a/global.json b/global.json index 845141406aa..f4ec64626fe 100644 --- a/global.json +++ b/global.json @@ -31,7 +31,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24151.1", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24151.1" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24151.5", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24151.5" } } From 404c7ee233a6d930ce0c31e2a490e3a3e7a4a957 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 4 Mar 2024 22:53:58 +0000 Subject: [PATCH 086/568] Restore branch-specific files --- eng/common/templates-official/job/job.yml | 2 +- .../job/publish-build-assets.yml | 10 ++- .../templates-official/job/source-build.yml | 2 +- .../job/source-index-stage1.yml | 11 ++- .../post-build/common-variables.yml | 4 +- .../templates-official/steps/build-reason.yml | 12 --- .../steps/execute-codeql.yml | 32 ------- .../templates-official/steps/execute-sdl.yml | 88 ------------------- .../steps/generate-sbom.yml | 2 +- .../templates-official/steps/publish-logs.yml | 28 +++++- .../templates-official/steps/source-build.yml | 4 +- 11 files changed, 47 insertions(+), 148 deletions(-) delete mode 100644 eng/common/templates-official/steps/build-reason.yml delete mode 100644 eng/common/templates-official/steps/execute-codeql.yml delete mode 100644 eng/common/templates-official/steps/execute-sdl.yml diff --git a/eng/common/templates-official/job/job.yml b/eng/common/templates-official/job/job.yml index 9e7bebe9af8..352607308fd 100644 --- a/eng/common/templates-official/job/job.yml +++ b/eng/common/templates-official/job/job.yml @@ -154,7 +154,7 @@ jobs: displayName: RichCodeNav Upload inputs: languages: ${{ coalesce(parameters.richCodeNavigationLanguage, 'csharp') }} - environment: ${{ coalesce(parameters.richCodeNavigationEnvironment, 'production') }} + environment: ${{ coalesce(parameters.richCodeNavigationEnvironment, 'internal') }} richNavLogOutputDirectory: $(Build.SourcesDirectory)/artifacts/bin uploadRichNavArtifacts: ${{ coalesce(parameters.richCodeNavigationUploadArtifacts, false) }} continueOnError: true diff --git a/eng/common/templates-official/job/publish-build-assets.yml b/eng/common/templates-official/job/publish-build-assets.yml index ea5104625fa..5f54135569b 100644 --- a/eng/common/templates-official/job/publish-build-assets.yml +++ b/eng/common/templates-official/job/publish-build-assets.yml @@ -48,8 +48,8 @@ jobs: - group: AzureDevOps-Artifact-Feeds-Pats - name: runCodesignValidationInjection value: false - - ${{ if eq(parameters.publishAssetsImmediately, 'true') }}: - - template: /eng/common/templates-official/post-build/common-variables.yml + # unconditional - needed for logs publishing (redactor tool version) + - template: /eng/common/templates-official/post-build/common-variables.yml pool: # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) @@ -65,6 +65,10 @@ jobs: os: windows 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: @@ -83,7 +87,7 @@ jobs: arguments: -task PublishBuildAssets -restore -msbuildEngine dotnet /p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests' /p:BuildAssetRegistryToken=$(MaestroAccessToken) - /p:MaestroApiEndpoint=https://maestro-prod.westus2.cloudapp.azure.com + /p:MaestroApiEndpoint=https://maestro.dot.net /p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }} /p:OfficialBuildId=$(Build.BuildNumber) condition: ${{ parameters.condition }} diff --git a/eng/common/templates-official/job/source-build.yml b/eng/common/templates-official/job/source-build.yml index 8aba3b44bb2..50f04e642a3 100644 --- a/eng/common/templates-official/job/source-build.yml +++ b/eng/common/templates-official/job/source-build.yml @@ -48,7 +48,7 @@ jobs: pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore-Svc-Public' ), False, 'NetCore-Public')] - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open + demands: ImageOverride -equals build.ubuntu.1804.amd64 ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')] diff --git a/eng/common/templates-official/job/source-index-stage1.yml b/eng/common/templates-official/job/source-index-stage1.yml index 4b633739170..757af7c7c4f 100644 --- a/eng/common/templates-official/job/source-index-stage1.yml +++ b/eng/common/templates-official/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,21 +30,20 @@ jobs: pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: name: $(DncEngPublicBuildPool) - demands: ImageOverride -equals windows.vs2019.amd64.open + image: windows.vs2022.amd64.open ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: $(DncEngInternalBuildPool) - image: 1es-windows-2022-pt - os: windows + image: 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/templates-official/post-build/common-variables.yml b/eng/common/templates-official/post-build/common-variables.yml index c24193acfc9..b9ede10bf09 100644 --- a/eng/common/templates-official/post-build/common-variables.yml +++ b/eng/common/templates-official/post-build/common-variables.yml @@ -7,7 +7,7 @@ variables: # Default Maestro++ API Endpoint and API Version - name: MaestroApiEndPoint - value: "https://maestro-prod.westus2.cloudapp.azure.com" + value: "https://maestro.dot.net" - name: MaestroApiAccessToken value: $(MaestroAccessToken) - name: MaestroApiVersion @@ -17,6 +17,8 @@ variables: value: 3.0.0 - name: SymbolToolVersion value: 1.0.1 + - name: BinlogToolVersion + value: 1.0.11 - name: runCodesignValidationInjection value: false diff --git a/eng/common/templates-official/steps/build-reason.yml b/eng/common/templates-official/steps/build-reason.yml deleted file mode 100644 index eba58109b52..00000000000 --- a/eng/common/templates-official/steps/build-reason.yml +++ /dev/null @@ -1,12 +0,0 @@ -# build-reason.yml -# Description: runs steps if build.reason condition is valid. conditions is a string of valid build reasons -# to include steps (',' separated). -parameters: - conditions: '' - steps: [] - -steps: - - ${{ if and( not(startsWith(parameters.conditions, 'not')), contains(parameters.conditions, variables['build.reason'])) }}: - - ${{ parameters.steps }} - - ${{ if and( startsWith(parameters.conditions, 'not'), not(contains(parameters.conditions, variables['build.reason']))) }}: - - ${{ parameters.steps }} diff --git a/eng/common/templates-official/steps/execute-codeql.yml b/eng/common/templates-official/steps/execute-codeql.yml deleted file mode 100644 index 9b4a5ffa30a..00000000000 --- a/eng/common/templates-official/steps/execute-codeql.yml +++ /dev/null @@ -1,32 +0,0 @@ -parameters: - # Language that should be analyzed. Defaults to csharp - language: csharp - # Build Commands - buildCommands: '' - overrideParameters: '' # Optional: to override values for parameters. - additionalParameters: '' # Optional: parameters that need user specific values eg: '-SourceToolsList @("abc","def") -ArtifactToolsList @("ghi","jkl")' - # Optional: if specified, restore and use this version of Guardian instead of the default. - overrideGuardianVersion: '' - # Optional: if true, publish the '.gdn' folder as a pipeline artifact. This can help with in-depth - # diagnosis of problems with specific tool configurations. - publishGuardianDirectoryToPipeline: false - # The script to run to execute all SDL tools. Use this if you want to use a script to define SDL - # parameters rather than relying on YAML. It may be better to use a local script, because you can - # reproduce results locally without piecing together a command based on the YAML. - executeAllSdlToolsScript: 'eng/common/sdl/execute-all-sdl-tools.ps1' - # There is some sort of bug (has been reported) in Azure DevOps where if this parameter is named - # 'continueOnError', the parameter value is not correctly picked up. - # This can also be remedied by the caller (post-build.yml) if it does not use a nested parameter - # optional: determines whether to continue the build if the step errors; - sdlContinueOnError: false - -steps: -- template: /eng/common/templates-official/steps/execute-sdl.yml - parameters: - overrideGuardianVersion: ${{ parameters.overrideGuardianVersion }} - executeAllSdlToolsScript: ${{ parameters.executeAllSdlToolsScript }} - overrideParameters: ${{ parameters.overrideParameters }} - additionalParameters: '${{ parameters.additionalParameters }} - -CodeQLAdditionalRunConfigParams @("BuildCommands < ${{ parameters.buildCommands }}", "Language < ${{ parameters.language }}")' - publishGuardianDirectoryToPipeline: ${{ parameters.publishGuardianDirectoryToPipeline }} - sdlContinueOnError: ${{ parameters.sdlContinueOnError }} \ No newline at end of file diff --git a/eng/common/templates-official/steps/execute-sdl.yml b/eng/common/templates-official/steps/execute-sdl.yml deleted file mode 100644 index 07426fde05d..00000000000 --- a/eng/common/templates-official/steps/execute-sdl.yml +++ /dev/null @@ -1,88 +0,0 @@ -parameters: - overrideGuardianVersion: '' - executeAllSdlToolsScript: '' - overrideParameters: '' - additionalParameters: '' - publishGuardianDirectoryToPipeline: false - sdlContinueOnError: false - condition: '' - -steps: -- task: NuGetAuthenticate@1 - inputs: - nuGetServiceConnections: GuardianConnect - -- task: NuGetToolInstaller@1 - displayName: 'Install NuGet.exe' - -- ${{ if ne(parameters.overrideGuardianVersion, '') }}: - - pwsh: | - Set-Location -Path $(Build.SourcesDirectory)\eng\common\sdl - . .\sdl.ps1 - $guardianCliLocation = Install-Gdn -Path $(Build.SourcesDirectory)\.artifacts -Version ${{ parameters.overrideGuardianVersion }} - Write-Host "##vso[task.setvariable variable=GuardianCliLocation]$guardianCliLocation" - displayName: Install Guardian (Overridden) - -- ${{ if eq(parameters.overrideGuardianVersion, '') }}: - - pwsh: | - Set-Location -Path $(Build.SourcesDirectory)\eng\common\sdl - . .\sdl.ps1 - $guardianCliLocation = Install-Gdn -Path $(Build.SourcesDirectory)\.artifacts - Write-Host "##vso[task.setvariable variable=GuardianCliLocation]$guardianCliLocation" - displayName: Install Guardian - -- ${{ if ne(parameters.overrideParameters, '') }}: - - powershell: ${{ parameters.executeAllSdlToolsScript }} ${{ parameters.overrideParameters }} - displayName: Execute SDL (Overridden) - continueOnError: ${{ parameters.sdlContinueOnError }} - condition: ${{ parameters.condition }} - -- ${{ if eq(parameters.overrideParameters, '') }}: - - powershell: ${{ parameters.executeAllSdlToolsScript }} - -GuardianCliLocation $(GuardianCliLocation) - -NugetPackageDirectory $(Build.SourcesDirectory)\.packages - -AzureDevOpsAccessToken $(dn-bot-dotnet-build-rw-code-rw) - ${{ parameters.additionalParameters }} - displayName: Execute SDL - continueOnError: ${{ parameters.sdlContinueOnError }} - condition: ${{ parameters.condition }} - -- ${{ if ne(parameters.publishGuardianDirectoryToPipeline, 'false') }}: - # We want to publish the Guardian results and configuration for easy diagnosis. However, the - # '.gdn' dir is a mix of configuration, results, extracted dependencies, and Guardian default - # tooling files. Some of these files are large and aren't useful during an investigation, so - # exclude them by simply deleting them before publishing. (As of writing, there is no documented - # way to selectively exclude a dir from the pipeline artifact publish task.) - - task: DeleteFiles@1 - displayName: Delete Guardian dependencies to avoid uploading - inputs: - SourceFolder: $(Agent.BuildDirectory)/.gdn - Contents: | - c - i - condition: succeededOrFailed() - - - publish: $(Agent.BuildDirectory)/.gdn - artifact: GuardianConfiguration - displayName: Publish GuardianConfiguration - condition: succeededOrFailed() - - # Publish the SARIF files in a container named CodeAnalysisLogs to enable integration - # with the "SARIF SAST Scans Tab" Azure DevOps extension - - task: CopyFiles@2 - displayName: Copy SARIF files - inputs: - flattenFolders: true - sourceFolder: $(Agent.BuildDirectory)/.gdn/rc/ - contents: '**/*.sarif' - targetFolder: $(Build.SourcesDirectory)/CodeAnalysisLogs - condition: succeededOrFailed() - - # Use PublishBuildArtifacts because the SARIF extension only checks this case - # see microsoft/sarif-azuredevops-extension#4 - - task: PublishBuildArtifacts@1 - displayName: Publish SARIF files to CodeAnalysisLogs container - inputs: - pathToPublish: $(Build.SourcesDirectory)/CodeAnalysisLogs - artifactName: CodeAnalysisLogs - condition: succeededOrFailed() \ No newline at end of file diff --git a/eng/common/templates-official/steps/generate-sbom.yml b/eng/common/templates-official/steps/generate-sbom.yml index 1bf43bf807a..488b560e8ba 100644 --- a/eng/common/templates-official/steps/generate-sbom.yml +++ b/eng/common/templates-official/steps/generate-sbom.yml @@ -5,7 +5,7 @@ # IgnoreDirectories - Directories to ignore for SBOM generation. This will be passed through to the CG component detector. parameters: - PackageVersion: 8.0.0 + PackageVersion: 7.0.0 BuildDropPath: '$(Build.SourcesDirectory)/artifacts' PackageName: '.NET' ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom diff --git a/eng/common/templates-official/steps/publish-logs.yml b/eng/common/templates-official/steps/publish-logs.yml index 04012fed182..84b2f559c56 100644 --- a/eng/common/templates-official/steps/publish-logs.yml +++ b/eng/common/templates-official/steps/publish-logs.yml @@ -1,6 +1,9 @@ parameters: StageLabel: '' JobLabel: '' + CustomSensitiveDataList: '' + # A default - in case value from eng/common/templates-official/post-build/common-variables.yml is not passed + BinlogToolVersion: '1.0.11' steps: - task: Powershell@2 @@ -12,7 +15,30 @@ 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() + - task: 1ES.PublishBuildArtifacts@1 displayName: Publish Logs inputs: diff --git a/eng/common/templates-official/steps/source-build.yml b/eng/common/templates-official/steps/source-build.yml index 829f17c34d1..b1db70842f5 100644 --- a/eng/common/templates-official/steps/source-build.yml +++ b/eng/common/templates-official/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' From 63b326462592da6f56c62e62ef1040e63753ea83 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 5 Mar 2024 15:31:03 -0800 Subject: [PATCH 087/568] Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20240305.1 (#6184) Microsoft.CodeAnalysis.NetAnalyzers From Version 9.0.0-preview.24151.1 -> To Version 9.0.0-preview.24155.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bb0f45a56e2..d52facb54cc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -18,9 +18,9 @@ - + https://github.com/dotnet/roslyn-analyzers - 59b2d9dc38fcc17dd618e3b3af3ce692aaeedb37 + 628d239421a3ae54464c60901fd9b831b3f01efa https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index dacf34b8f28..4d6b5310033 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -62,7 +62,7 @@ 9.0.100-preview.3.24153.2 - 9.0.0-preview.24151.1 + 9.0.0-preview.24155.1 9.0.0-preview.3.24129.2 9.0.0-preview.3.24129.2 From ee49e57e3aa6afe80313aacf7c3df6e23e515331 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 5 Mar 2024 15:31:06 -0800 Subject: [PATCH 088/568] Update dependencies from https://github.com/dotnet/installer build 20240305.3 (#6183) Microsoft.Dotnet.Sdk.Internal From Version 9.0.100-preview.3.24153.2 -> To Version 9.0.100-preview.3.24155.3 Dependency coherency updates Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0 From Version 9.0.0-preview.3.24151.1 -> To Version 9.0.0-preview.3.24154.8 (parent: Microsoft.Dotnet.Sdk.Internal Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d52facb54cc..440c4b6803a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/aspnetcore - 3e5155276f3d486ef49e1f06ee875d6757983695 + 2c0ee4c870556d823ea5a0b35a8ba1b8ae81142c https://github.com/dotnet/diagnostics @@ -38,9 +38,9 @@ https://github.com/dotnet/arcade 87d89025bdd8827c016e4083660d31f497670e5c - + https://github.com/dotnet/installer - 893b762b6e36d558df7ae6fccdfd8034f83a1c2e + 75494d3ada6624c411116d4c6e52daaf49154ee7 https://github.com/dotnet/arcade @@ -50,17 +50,17 @@ https://github.com/dotnet/symstore 96a152a28e86ecc5c68ec9a73e02bb1e93163338 - + https://github.com/dotnet/runtime - 5e603d595e63ddc5cdce9777a40608279abdcc37 + 8510651bc6b5181cf258664c2d0b4b4ff4de1c61 - + https://github.com/dotnet/aspnetcore - 3e5155276f3d486ef49e1f06ee875d6757983695 + 2c0ee4c870556d823ea5a0b35a8ba1b8ae81142c - + https://github.com/dotnet/runtime - 5e603d595e63ddc5cdce9777a40608279abdcc37 + 8510651bc6b5181cf258664c2d0b4b4ff4de1c61 diff --git a/eng/Versions.props b/eng/Versions.props index 4d6b5310033..5bfb8e4ec81 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,20 +52,20 @@ 9.0.0-beta.24151.5 9.0.0-beta.24151.5 - 9.0.0-preview.3.24151.1 - 9.0.0-preview.3.24151.1 + 9.0.0-preview.3.24154.8 + 9.0.0-preview.3.24154.8 2.0.0-beta4.24126.1 8.0.0-preview.24151.1 8.0.0-preview.24151.1 - 9.0.100-preview.3.24153.2 + 9.0.100-preview.3.24155.3 9.0.0-preview.24155.1 - 9.0.0-preview.3.24129.2 - 9.0.0-preview.3.24129.2 + 9.0.0-preview.3.24154.9 + 9.0.0-preview.3.24154.9 1.0.511901 From 1253027b4f401f2e57b1ed7610de8c3d045a8f0a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 5 Mar 2024 15:31:08 -0800 Subject: [PATCH 089/568] Update dependencies from https://github.com/dotnet/symstore build 20240304.1 (#6181) Microsoft.FileFormats From Version 1.0.511901 -> To Version 1.0.515401 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 440c4b6803a..c3c0adbea7c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -46,9 +46,9 @@ https://github.com/dotnet/arcade 87d89025bdd8827c016e4083660d31f497670e5c - + https://github.com/dotnet/symstore - 96a152a28e86ecc5c68ec9a73e02bb1e93163338 + 4131f06fdb328c3037c3c6cdc0104d52497260b4 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 5bfb8e4ec81..a2061b7d5e7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -67,7 +67,7 @@ 9.0.0-preview.3.24154.9 9.0.0-preview.3.24154.9 - 1.0.511901 + 1.0.515401 $(MicrosoftNETCoreApp31Version) From 884de39d470c28db2287717156ffc7f53b07cb93 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 5 Mar 2024 15:31:10 -0800 Subject: [PATCH 090/568] Update dependencies from https://github.com/dotnet/arcade build 20240304.2 (#6180) Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.24151.5 -> To Version 9.0.0-beta.24154.2 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- global.json | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c3c0adbea7c..916b028dd56 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,29 +22,29 @@ https://github.com/dotnet/roslyn-analyzers 628d239421a3ae54464c60901fd9b831b3f01efa - + https://github.com/dotnet/arcade - 87d89025bdd8827c016e4083660d31f497670e5c + 010fecb0832fd4f0a39012ebd0859afc4bca750d - + https://github.com/dotnet/arcade - 87d89025bdd8827c016e4083660d31f497670e5c + 010fecb0832fd4f0a39012ebd0859afc4bca750d - + https://github.com/dotnet/arcade - 87d89025bdd8827c016e4083660d31f497670e5c + 010fecb0832fd4f0a39012ebd0859afc4bca750d - + https://github.com/dotnet/arcade - 87d89025bdd8827c016e4083660d31f497670e5c + 010fecb0832fd4f0a39012ebd0859afc4bca750d https://github.com/dotnet/installer 75494d3ada6624c411116d4c6e52daaf49154ee7 - + https://github.com/dotnet/arcade - 87d89025bdd8827c016e4083660d31f497670e5c + 010fecb0832fd4f0a39012ebd0859afc4bca750d https://github.com/dotnet/symstore diff --git a/eng/Versions.props b/eng/Versions.props index a2061b7d5e7..5fbd2f00371 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,9 +48,9 @@ --> - 9.0.0-beta.24151.5 - 9.0.0-beta.24151.5 - 9.0.0-beta.24151.5 + 9.0.0-beta.24154.2 + 9.0.0-beta.24154.2 + 9.0.0-beta.24154.2 9.0.0-preview.3.24154.8 9.0.0-preview.3.24154.8 diff --git a/global.json b/global.json index f4ec64626fe..a8e3e3a3686 100644 --- a/global.json +++ b/global.json @@ -31,7 +31,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24151.5", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24151.5" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24154.2", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24154.2" } } From ef32ee29e684d66ef3801032a7289609bcc139b7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 5 Mar 2024 15:31:13 -0800 Subject: [PATCH 091/568] Update dependencies from https://github.com/dotnet/diagnostics build 20240304.1 (#6179) Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe From Version 8.0.0-preview.24151.1 -> To Version 8.0.0-preview.24154.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 916b028dd56..b30ce1fee8d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore 2c0ee4c870556d823ea5a0b35a8ba1b8ae81142c - + https://github.com/dotnet/diagnostics - 831eee3a9e69dd886fa190a9914a7f66260c653a + 6b101c405ec30d8f841d74d8e416bd4ac2b19f7e - + https://github.com/dotnet/diagnostics - 831eee3a9e69dd886fa190a9914a7f66260c653a + 6b101c405ec30d8f841d74d8e416bd4ac2b19f7e https://github.com/dotnet/command-line-api diff --git a/eng/Versions.props b/eng/Versions.props index 5fbd2f00371..9c7ba5b5662 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24126.1 - 8.0.0-preview.24151.1 - 8.0.0-preview.24151.1 + 8.0.0-preview.24154.1 + 8.0.0-preview.24154.1 9.0.100-preview.3.24155.3 From 7f410092ac75ffcde3369528a7856e306411023a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 7 Mar 2024 10:42:54 -0800 Subject: [PATCH 092/568] [feature/9.x] Sync branch with origin/main (#6206) * Update dependencies from https://github.com/dotnet/symstore build 20240304.1 (#6178) Microsoft.FileFormats From Version 1.0.511901 -> To Version 1.0.515401 Co-authored-by: dotnet-maestro[bot] * Update dependencies from https://github.com/dotnet/diagnostics build 20240304.1 (#6177) Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe From Version 8.0.0-preview.24151.1 -> To Version 8.0.0-preview.24154.1 Co-authored-by: dotnet-maestro[bot] * generate release notes (#6189) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Bifurcate official pipeline from public pipeline (#6200) --------- Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: dotnet-maestro[bot] Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Justin Anderson --- .../releaseNotes.v9.0.0-preview.2.md | 9 + eng/pipelines/dotnet-monitor-official.yml | 162 ++++++++++++++++++ eng/pipelines/dotnet-monitor-public.yml | 162 ++++++++++++++++++ 3 files changed, 333 insertions(+) create mode 100644 documentation/releaseNotes/releaseNotes.v9.0.0-preview.2.md create mode 100644 eng/pipelines/dotnet-monitor-official.yml create mode 100644 eng/pipelines/dotnet-monitor-public.yml diff --git a/documentation/releaseNotes/releaseNotes.v9.0.0-preview.2.md b/documentation/releaseNotes/releaseNotes.v9.0.0-preview.2.md new file mode 100644 index 00000000000..e7046e7d1a5 --- /dev/null +++ b/documentation/releaseNotes/releaseNotes.v9.0.0-preview.2.md @@ -0,0 +1,9 @@ +Today we are releasing the next official preview version of the `dotnet monitor` tool. This release includes: + +- ⚠️ Replace SwaggerUI and SwaggerScope option with OpenAPI document ([#6146](https://github.com/dotnet/dotnet-monitor/pull/6146)) +- 🔬 Update `POST /parameters` to support stopping after a certain number of times parameters are captured. ([#6060](https://github.com/dotnet/dotnet-monitor/pull/6060)) + +\*⚠️ **_indicates a breaking change_** \ +\*🔬 **_indicates an experimental feature_** + +If you would like to provide additional feedback to the team [please fill out this survey](https://aka.ms/dotnet-monitor-survey?src=rn). \ No newline at end of file diff --git a/eng/pipelines/dotnet-monitor-official.yml b/eng/pipelines/dotnet-monitor-official.yml new file mode 100644 index 00000000000..396d0b318b8 --- /dev/null +++ b/eng/pipelines/dotnet-monitor-official.yml @@ -0,0 +1,162 @@ +trigger: none + +pr: + autoCancel: true + branches: + include: + - main + - release/* + - internal/release/* + - feature/* + paths: + exclude: + - .devcontainer + - .github + - .vscode + - .gitignore + - cspell.json + - eng/actions + - samples + - '**.md' + +schedules: +# Schedule before docker update pipeline +- cron: "0 3 * * Mon-Fri" + displayName: M-F Scheduled Build + branches: + include: + - main + +parameters: +- name: testGroup + displayName: 'Test Group' + type: string + default: Default + values: + - Default + - All + - None + - CI + - PR +- name: updateDocker + displayName: 'Update dotnet-docker? (Only for release branches)' + type: boolean + default: false +- name: useHelix + displayName: Use Helix Testing + type: boolean + default: true + +variables: +- template: /eng/common/templates/variables/pool-providers.yml +- name: _TeamName + value: DotNetCore +- name: _TPNFile + value: THIRD-PARTY-NOTICES.TXT + +- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + # DotNet-Diagnostics-SDL-Params provides Tsa* variables for SDL checks. + - group: DotNet-Diagnostics-SDL-Params + +stages: +- stage: Build + displayName: Build and Test + jobs: + - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + # Generate a TPN for only the dotnet-monitor project + - template: /eng/pipelines/jobs/tpn.yml + + # Build and (optionally) test binaries + - template: /eng/pipelines/jobs/platform-matrix.yml + parameters: + jobTemplate: /eng/pipelines/jobs/build-binaries.yml + includeArm64: ${{ or(ne(variables['System.TeamProject'], 'public'), eq(parameters.useHelix, 'true')) }} + includeDebug: true + jobParameters: + publishBinaries: true + publishArtifacts: ${{ and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }} + + - ${{ if ne(parameters.testGroup, 'None') }}: + - template: /eng/pipelines/jobs/platform-matrix.yml + parameters: + jobTemplate: /eng/pipelines/jobs/test-binaries.yml + includeArm64: ${{ parameters.useHelix }} + jobParameters: + testGroup: ${{ parameters.testGroup }} + useHelix: ${{ parameters.useHelix }} + +- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - stage: Archive + displayName: Archive + dependsOn: + - Build + jobs: + # Sign binaries before archiving + - template: /eng/pipelines/jobs/sign-binaries.yml + + # Build RID (runtime identifier) archives + - template: /eng/pipelines/jobs/platform-matrix.yml + parameters: + jobTemplate: /eng/pipelines/jobs/build-archive.yml + includeArm64: true +# This stage creates NuGet packages and generates the BAR manifests +- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - stage: PackSignPublish + displayName: Pack, Sign, and Generate Manifests + dependsOn: + - Archive + jobs: + # Pack, sign, and publish manifest + - template: /eng/pipelines/jobs/pack-sign-publish.yml + + # Register with BAR + - template: /eng/common/templates/job/publish-build-assets.yml + parameters: + configuration: Release + dependsOn: + - Pack_Sign + publishUsingPipelines: true + pool: + name: $(DncEngInternalBuildPool) + demands: ImageOverride -equals 1es-windows-2019 +# These are the stages that perform validation of several SDL requirements and publish the bits required to the designated feed. + - template: /eng/common/templates/post-build/post-build.yml + parameters: + # This is to enable SDL runs part of Post-Build Validation Stage. + # as well as NuGet, SourceLink, and signing validation. + # The variables get imported from group dotnet-diagnostics-sdl-params + validateDependsOn: + - PackSignPublish + publishingInfraVersion: 3 + enableSourceLinkValidation: ${{ and(not(startsWith(variables['Build.SourceBranch'], 'refs/heads/internal/release/')), not(startsWith(variables['Build.SourceBranch'], 'refs/heads/test/release/'))) }} + enableSigningValidation: true + enableSymbolValidation: false + enableNugetValidation: true + publishInstallersAndChecksums: true + SDLValidationParameters: + enable: true + continueOnError: true + publishGdn: true + params: >- + -SourceToolsList @("policheck","credscan") + -TsaInstanceURL $(_TsaInstanceURL) + -TsaProjectName $(_TsaProjectName) + -TsaNotificationEmail $(_TsaNotificationEmail) + -TsaCodebaseAdmin $(_TsaCodebaseAdmin) + -TsaBugAreaPath $(_TsaBugAreaPath) + -TsaIterationPath $(_TsaIterationPath) + -TsaRepositoryName "dotnet-monitor" + -TsaCodebaseName "dotnet-monitor" + -TsaPublish $True + -PoliCheckAdditionalRunConfigParams @("UserExclusionPath < $(Build.SourcesDirectory)/eng/PoliCheckExclusions.xml") + artifactNames: + - 'PackageArtifacts' +# This sets up the bits to do a Release. +- template: /eng/pipelines/stages/preparerelease.yml + parameters: + ${{ if eq(parameters.updateDocker, 'true') }}: + updateDockerCondition: true + ${{ else }}: + # If scheduled build from main and nightly update from main enabled + updateDockerCondition: and(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.Reason'], 'Schedule'), eq(variables['NightlyUpdateDockerFromMain'], 'true')) + diff --git a/eng/pipelines/dotnet-monitor-public.yml b/eng/pipelines/dotnet-monitor-public.yml new file mode 100644 index 00000000000..396d0b318b8 --- /dev/null +++ b/eng/pipelines/dotnet-monitor-public.yml @@ -0,0 +1,162 @@ +trigger: none + +pr: + autoCancel: true + branches: + include: + - main + - release/* + - internal/release/* + - feature/* + paths: + exclude: + - .devcontainer + - .github + - .vscode + - .gitignore + - cspell.json + - eng/actions + - samples + - '**.md' + +schedules: +# Schedule before docker update pipeline +- cron: "0 3 * * Mon-Fri" + displayName: M-F Scheduled Build + branches: + include: + - main + +parameters: +- name: testGroup + displayName: 'Test Group' + type: string + default: Default + values: + - Default + - All + - None + - CI + - PR +- name: updateDocker + displayName: 'Update dotnet-docker? (Only for release branches)' + type: boolean + default: false +- name: useHelix + displayName: Use Helix Testing + type: boolean + default: true + +variables: +- template: /eng/common/templates/variables/pool-providers.yml +- name: _TeamName + value: DotNetCore +- name: _TPNFile + value: THIRD-PARTY-NOTICES.TXT + +- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + # DotNet-Diagnostics-SDL-Params provides Tsa* variables for SDL checks. + - group: DotNet-Diagnostics-SDL-Params + +stages: +- stage: Build + displayName: Build and Test + jobs: + - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + # Generate a TPN for only the dotnet-monitor project + - template: /eng/pipelines/jobs/tpn.yml + + # Build and (optionally) test binaries + - template: /eng/pipelines/jobs/platform-matrix.yml + parameters: + jobTemplate: /eng/pipelines/jobs/build-binaries.yml + includeArm64: ${{ or(ne(variables['System.TeamProject'], 'public'), eq(parameters.useHelix, 'true')) }} + includeDebug: true + jobParameters: + publishBinaries: true + publishArtifacts: ${{ and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }} + + - ${{ if ne(parameters.testGroup, 'None') }}: + - template: /eng/pipelines/jobs/platform-matrix.yml + parameters: + jobTemplate: /eng/pipelines/jobs/test-binaries.yml + includeArm64: ${{ parameters.useHelix }} + jobParameters: + testGroup: ${{ parameters.testGroup }} + useHelix: ${{ parameters.useHelix }} + +- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - stage: Archive + displayName: Archive + dependsOn: + - Build + jobs: + # Sign binaries before archiving + - template: /eng/pipelines/jobs/sign-binaries.yml + + # Build RID (runtime identifier) archives + - template: /eng/pipelines/jobs/platform-matrix.yml + parameters: + jobTemplate: /eng/pipelines/jobs/build-archive.yml + includeArm64: true +# This stage creates NuGet packages and generates the BAR manifests +- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - stage: PackSignPublish + displayName: Pack, Sign, and Generate Manifests + dependsOn: + - Archive + jobs: + # Pack, sign, and publish manifest + - template: /eng/pipelines/jobs/pack-sign-publish.yml + + # Register with BAR + - template: /eng/common/templates/job/publish-build-assets.yml + parameters: + configuration: Release + dependsOn: + - Pack_Sign + publishUsingPipelines: true + pool: + name: $(DncEngInternalBuildPool) + demands: ImageOverride -equals 1es-windows-2019 +# These are the stages that perform validation of several SDL requirements and publish the bits required to the designated feed. + - template: /eng/common/templates/post-build/post-build.yml + parameters: + # This is to enable SDL runs part of Post-Build Validation Stage. + # as well as NuGet, SourceLink, and signing validation. + # The variables get imported from group dotnet-diagnostics-sdl-params + validateDependsOn: + - PackSignPublish + publishingInfraVersion: 3 + enableSourceLinkValidation: ${{ and(not(startsWith(variables['Build.SourceBranch'], 'refs/heads/internal/release/')), not(startsWith(variables['Build.SourceBranch'], 'refs/heads/test/release/'))) }} + enableSigningValidation: true + enableSymbolValidation: false + enableNugetValidation: true + publishInstallersAndChecksums: true + SDLValidationParameters: + enable: true + continueOnError: true + publishGdn: true + params: >- + -SourceToolsList @("policheck","credscan") + -TsaInstanceURL $(_TsaInstanceURL) + -TsaProjectName $(_TsaProjectName) + -TsaNotificationEmail $(_TsaNotificationEmail) + -TsaCodebaseAdmin $(_TsaCodebaseAdmin) + -TsaBugAreaPath $(_TsaBugAreaPath) + -TsaIterationPath $(_TsaIterationPath) + -TsaRepositoryName "dotnet-monitor" + -TsaCodebaseName "dotnet-monitor" + -TsaPublish $True + -PoliCheckAdditionalRunConfigParams @("UserExclusionPath < $(Build.SourcesDirectory)/eng/PoliCheckExclusions.xml") + artifactNames: + - 'PackageArtifacts' +# This sets up the bits to do a Release. +- template: /eng/pipelines/stages/preparerelease.yml + parameters: + ${{ if eq(parameters.updateDocker, 'true') }}: + updateDockerCondition: true + ${{ else }}: + # If scheduled build from main and nightly update from main enabled + updateDockerCondition: and(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.Reason'], 'Schedule'), eq(variables['NightlyUpdateDockerFromMain'], 'true')) + From d122837216ea27002dfdd9bf64e6582d55ef9746 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 12 Mar 2024 09:32:17 -0700 Subject: [PATCH 093/568] Update dependencies from https://github.com/dotnet/symstore build 20240311.1 (#6220) Microsoft.FileFormats From Version 1.0.515401 -> To Version 1.0.516101 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b30ce1fee8d..56de2a6c126 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -46,9 +46,9 @@ https://github.com/dotnet/arcade 010fecb0832fd4f0a39012ebd0859afc4bca750d - + https://github.com/dotnet/symstore - 4131f06fdb328c3037c3c6cdc0104d52497260b4 + 12fbd806da23e09bdf12352266b4de7253677f29 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 9c7ba5b5662..bc92af2d09c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -67,7 +67,7 @@ 9.0.0-preview.3.24154.9 9.0.0-preview.3.24154.9 - 1.0.515401 + 1.0.516101 $(MicrosoftNETCoreApp31Version) From c5eb1de4f560b8345f9fc755b99e5c5affe21d5a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 12 Mar 2024 09:32:21 -0700 Subject: [PATCH 094/568] [feature/9.x] Update dependencies from dotnet/roslyn-analyzers (#6199) * Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20240306.1 Microsoft.CodeAnalysis.NetAnalyzers From Version 9.0.0-preview.24155.1 -> To Version 9.0.0-preview.24156.1 * Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20240306.1 Microsoft.CodeAnalysis.NetAnalyzers From Version 9.0.0-preview.24155.1 -> To Version 9.0.0-preview.24156.1 * Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20240308.2 Microsoft.CodeAnalysis.NetAnalyzers From Version 9.0.0-preview.24155.1 -> To Version 9.0.0-preview.24158.2 * Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20240308.2 Microsoft.CodeAnalysis.NetAnalyzers From Version 9.0.0-preview.24155.1 -> To Version 9.0.0-preview.24158.2 * Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20240308.2 Microsoft.CodeAnalysis.NetAnalyzers From Version 9.0.0-preview.24155.1 -> To Version 9.0.0-preview.24158.2 * Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20240311.1 Microsoft.CodeAnalysis.NetAnalyzers From Version 9.0.0-preview.24155.1 -> To Version 9.0.0-preview.24161.1 --------- Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 56de2a6c126..704f422f2f1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -18,9 +18,9 @@ - + https://github.com/dotnet/roslyn-analyzers - 628d239421a3ae54464c60901fd9b831b3f01efa + d98dd32d7cd4274bea98b147032b73a4eb051f2c https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index bc92af2d09c..4a4e999ea40 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -62,7 +62,7 @@ 9.0.100-preview.3.24155.3 - 9.0.0-preview.24155.1 + 9.0.0-preview.24161.1 9.0.0-preview.3.24154.9 9.0.0-preview.3.24154.9 From 964f7f3b0cb93849ab3407ea895061d1f55f9300 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 12 Mar 2024 09:33:15 -0700 Subject: [PATCH 095/568] [feature/9.x] Update dependencies from dotnet/installer (#6198) * Update dependencies from https://github.com/dotnet/installer build 20240307.4 Microsoft.Dotnet.Sdk.Internal From Version 9.0.100-preview.3.24155.3 -> To Version 9.0.100-preview.3.24157.4 Dependency coherency updates Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0 From Version 9.0.0-preview.3.24154.8 -> To Version 9.0.0-preview.3.24156.20 (parent: Microsoft.Dotnet.Sdk.Internal * Update dependencies from https://github.com/dotnet/installer build 20240307.13 Microsoft.Dotnet.Sdk.Internal From Version 9.0.100-preview.3.24155.3 -> To Version 9.0.100-preview.3.24157.13 Dependency coherency updates Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0 From Version 9.0.0-preview.3.24154.8 -> To Version 9.0.0-preview.3.24156.20 (parent: Microsoft.Dotnet.Sdk.Internal * Update dependencies from https://github.com/dotnet/installer build 20240309.1 Microsoft.Dotnet.Sdk.Internal From Version 9.0.100-preview.3.24155.3 -> To Version 9.0.100-preview.3.24159.1 Dependency coherency updates Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0 From Version 9.0.0-preview.3.24154.8 -> To Version 9.0.0-preview.3.24156.20 (parent: Microsoft.Dotnet.Sdk.Internal * Update dependencies from https://github.com/dotnet/installer build 20240310.1 Microsoft.Dotnet.Sdk.Internal From Version 9.0.100-preview.3.24155.3 -> To Version 9.0.100-preview.3.24160.1 Dependency coherency updates Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0 From Version 9.0.0-preview.3.24154.8 -> To Version 9.0.0-preview.3.24157.5 (parent: Microsoft.Dotnet.Sdk.Internal * Update dependencies from https://github.com/dotnet/installer build 20240311.2 Microsoft.Dotnet.Sdk.Internal From Version 9.0.100-preview.3.24155.3 -> To Version 9.0.100-preview.3.24161.2 Dependency coherency updates Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0 From Version 9.0.0-preview.3.24154.8 -> To Version 9.0.0-preview.3.24158.2 (parent: Microsoft.Dotnet.Sdk.Internal * Update dependencies from https://github.com/dotnet/installer build 20240312.2 Microsoft.Dotnet.Sdk.Internal From Version 9.0.100-preview.3.24155.3 -> To Version 9.0.100-preview.3.24162.2 Dependency coherency updates Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0 From Version 9.0.0-preview.3.24154.8 -> To Version 9.0.0-preview.3.24161.11 (parent: Microsoft.Dotnet.Sdk.Internal --------- Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 704f422f2f1..3ba972b5df1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/aspnetcore - 2c0ee4c870556d823ea5a0b35a8ba1b8ae81142c + 1ee58ec0d8837ac310c9ef9e784a35bf3027dbd5 https://github.com/dotnet/diagnostics @@ -38,9 +38,9 @@ https://github.com/dotnet/arcade 010fecb0832fd4f0a39012ebd0859afc4bca750d - + https://github.com/dotnet/installer - 75494d3ada6624c411116d4c6e52daaf49154ee7 + 2c7352096e706974f428d9d54d5aba78e9734242 https://github.com/dotnet/arcade @@ -50,17 +50,17 @@ https://github.com/dotnet/symstore 12fbd806da23e09bdf12352266b4de7253677f29 - + https://github.com/dotnet/runtime - 8510651bc6b5181cf258664c2d0b4b4ff4de1c61 + efa2b78175388a656893d0e9becc408d99afe445 - + https://github.com/dotnet/aspnetcore - 2c0ee4c870556d823ea5a0b35a8ba1b8ae81142c + 1ee58ec0d8837ac310c9ef9e784a35bf3027dbd5 - + https://github.com/dotnet/runtime - 8510651bc6b5181cf258664c2d0b4b4ff4de1c61 + efa2b78175388a656893d0e9becc408d99afe445 diff --git a/eng/Versions.props b/eng/Versions.props index 4a4e999ea40..1219f368989 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,20 +52,20 @@ 9.0.0-beta.24154.2 9.0.0-beta.24154.2 - 9.0.0-preview.3.24154.8 - 9.0.0-preview.3.24154.8 + 9.0.0-preview.3.24161.11 + 9.0.0-preview.3.24161.11 2.0.0-beta4.24126.1 8.0.0-preview.24154.1 8.0.0-preview.24154.1 - 9.0.100-preview.3.24155.3 + 9.0.100-preview.3.24162.2 9.0.0-preview.24161.1 - 9.0.0-preview.3.24154.9 - 9.0.0-preview.3.24154.9 + 9.0.0-preview.3.24161.4 + 9.0.0-preview.3.24161.4 1.0.516101 From d15b2f6fb0bc9eca2c5e84dacc14d40a429eed7e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 12 Mar 2024 09:33:27 -0700 Subject: [PATCH 096/568] [feature/9.x] Update dependencies from dotnet/arcade (#6195) * Update dependencies from https://github.com/dotnet/arcade build 20240306.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.24154.2 -> To Version 9.0.0-beta.24156.2 * Update dependencies from https://github.com/dotnet/arcade build 20240307.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.24154.2 -> To Version 9.0.0-beta.24157.3 * Update dependencies from https://github.com/dotnet/arcade build 20240308.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.24154.2 -> To Version 9.0.0-beta.24158.3 * Update dependencies from https://github.com/dotnet/arcade build 20240309.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.24154.2 -> To Version 9.0.0-beta.24159.1 * Update dependencies from https://github.com/dotnet/arcade build 20240309.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.24154.2 -> To Version 9.0.0-beta.24159.1 * Update dependencies from https://github.com/dotnet/arcade build 20240311.5 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.24154.2 -> To Version 9.0.0-beta.24161.5 --------- Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 20 +++++++------- eng/Versions.props | 6 ++--- eng/common/SetupNugetSources.ps1 | 26 +++++++++---------- eng/common/build.ps1 | 1 - eng/common/build.sh | 1 - eng/common/templates-official/job/job.yml | 22 +++++++++++----- .../job/source-index-stage1.yml | 2 +- .../steps/send-to-helix.yml | 6 +++-- .../templates-official/steps/source-build.yml | 2 ++ eng/common/templates/job/job.yml | 4 +++ eng/common/tools.ps1 | 2 +- global.json | 4 +-- 12 files changed, 55 insertions(+), 41 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3ba972b5df1..dd76e48208c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,29 +22,29 @@ https://github.com/dotnet/roslyn-analyzers d98dd32d7cd4274bea98b147032b73a4eb051f2c - + https://github.com/dotnet/arcade - 010fecb0832fd4f0a39012ebd0859afc4bca750d + 39839f3007d9f3bbabf7a4b6a96ef5dd6be9e5ac - + https://github.com/dotnet/arcade - 010fecb0832fd4f0a39012ebd0859afc4bca750d + 39839f3007d9f3bbabf7a4b6a96ef5dd6be9e5ac - + https://github.com/dotnet/arcade - 010fecb0832fd4f0a39012ebd0859afc4bca750d + 39839f3007d9f3bbabf7a4b6a96ef5dd6be9e5ac - + https://github.com/dotnet/arcade - 010fecb0832fd4f0a39012ebd0859afc4bca750d + 39839f3007d9f3bbabf7a4b6a96ef5dd6be9e5ac https://github.com/dotnet/installer 2c7352096e706974f428d9d54d5aba78e9734242 - + https://github.com/dotnet/arcade - 010fecb0832fd4f0a39012ebd0859afc4bca750d + 39839f3007d9f3bbabf7a4b6a96ef5dd6be9e5ac https://github.com/dotnet/symstore diff --git a/eng/Versions.props b/eng/Versions.props index 1219f368989..48d7f60c98e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,9 +48,9 @@ --> - 9.0.0-beta.24154.2 - 9.0.0-beta.24154.2 - 9.0.0-beta.24154.2 + 9.0.0-beta.24161.5 + 9.0.0-beta.24161.5 + 9.0.0-beta.24161.5 9.0.0-preview.3.24161.11 9.0.0-preview.3.24161.11 diff --git a/eng/common/SetupNugetSources.ps1 b/eng/common/SetupNugetSources.ps1 index 6c65e81925f..efa2fd72bfa 100644 --- a/eng/common/SetupNugetSources.ps1 +++ b/eng/common/SetupNugetSources.ps1 @@ -35,7 +35,7 @@ Set-StrictMode -Version 2.0 . $PSScriptRoot\tools.ps1 # Add source entry to PackageSources -function AddPackageSource($sources, $SourceName, $SourceEndPoint, $creds, $Username, $Password) { +function AddPackageSource($sources, $SourceName, $SourceEndPoint, $creds, $Username, $pwd) { $packageSource = $sources.SelectSingleNode("add[@key='$SourceName']") if ($packageSource -eq $null) @@ -48,12 +48,11 @@ function AddPackageSource($sources, $SourceName, $SourceEndPoint, $creds, $Usern else { Write-Host "Package source $SourceName already present." } - - AddCredential -Creds $creds -Source $SourceName -Username $Username -Password $Password + AddCredential -Creds $creds -Source $SourceName -Username $Username -pwd $pwd } # Add a credential node for the specified source -function AddCredential($creds, $source, $username, $password) { +function AddCredential($creds, $source, $username, $pwd) { # Looks for credential configuration for the given SourceName. Create it if none is found. $sourceElement = $creds.SelectSingleNode($Source) if ($sourceElement -eq $null) @@ -82,17 +81,18 @@ function AddCredential($creds, $source, $username, $password) { $passwordElement.SetAttribute("key", "ClearTextPassword") $sourceElement.AppendChild($passwordElement) | Out-Null } - $passwordElement.SetAttribute("value", $Password) + + $passwordElement.SetAttribute("value", $pwd) } -function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Username, $Password) { +function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Username, $pwd) { $maestroPrivateSources = $Sources.SelectNodes("add[contains(@key,'darc-int')]") Write-Host "Inserting credentials for $($maestroPrivateSources.Count) Maestro's private feeds." ForEach ($PackageSource in $maestroPrivateSources) { Write-Host "`tInserting credential for Maestro's feed:" $PackageSource.Key - AddCredential -Creds $creds -Source $PackageSource.Key -Username $Username -Password $Password + AddCredential -Creds $creds -Source $PackageSource.Key -Username $Username -pwd $pwd } } @@ -144,13 +144,13 @@ if ($disabledSources -ne $null) { $userName = "dn-bot" # Insert credential nodes for Maestro's private feeds -InsertMaestroPrivateFeedCredentials -Sources $sources -Creds $creds -Username $userName -Password $Password +InsertMaestroPrivateFeedCredentials -Sources $sources -Creds $creds -Username $userName -pwd $Password # 3.1 uses a different feed url format so it's handled differently here $dotnet31Source = $sources.SelectSingleNode("add[@key='dotnet3.1']") if ($dotnet31Source -ne $null) { - AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v2" -Creds $creds -Username $userName -Password $Password - AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password + AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v2" -Creds $creds -Username $userName -pwd $Password + AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2" -Creds $creds -Username $userName -pwd $Password } $dotnetVersions = @('5','6','7','8') @@ -159,9 +159,9 @@ foreach ($dotnetVersion in $dotnetVersions) { $feedPrefix = "dotnet" + $dotnetVersion; $dotnetSource = $sources.SelectSingleNode("add[@key='$feedPrefix']") if ($dotnetSource -ne $null) { - AddPackageSource -Sources $sources -SourceName "$feedPrefix-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal/nuget/v2" -Creds $creds -Username $userName -Password $Password - AddPackageSource -Sources $sources -SourceName "$feedPrefix-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password + AddPackageSource -Sources $sources -SourceName "$feedPrefix-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal/nuget/v2" -Creds $creds -Username $userName -pwd $Password + AddPackageSource -Sources $sources -SourceName "$feedPrefix-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal-transport/nuget/v2" -Creds $creds -Username $userName -pwd $Password } } -$doc.Save($filename) +$doc.Save($filename) \ No newline at end of file diff --git a/eng/common/build.ps1 b/eng/common/build.ps1 index 510458eb35b..83e6d82e027 100644 --- a/eng/common/build.ps1 +++ b/eng/common/build.ps1 @@ -125,7 +125,6 @@ function Build { /p:Test=$test ` /p:Pack=$pack ` /p:DotNetBuildRepo=$($productBuild -or $verticalBuild) ` - /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 bec7d02594f..d82ebf74280 100755 --- a/eng/common/build.sh +++ b/eng/common/build.sh @@ -241,7 +241,6 @@ function Build { /p:DotNetBuildRepo=$product_build \ /p:ArcadeBuildFromSource=$source_build \ /p:DotNetBuildSourceOnly=$source_build \ - /p:ArcadeBuildVertical=$vertical_build \ /p:Rebuild=$rebuild \ /p:Test=$test \ /p:Pack=$pack \ diff --git a/eng/common/templates-official/job/job.yml b/eng/common/templates-official/job/job.yml index 352607308fd..dfc3c0cf07c 100644 --- a/eng/common/templates-official/job/job.yml +++ b/eng/common/templates-official/job/job.yml @@ -15,6 +15,7 @@ parameters: timeoutInMinutes: '' variables: [] workspace: '' + templateContext: '' # Job base template specific parameters # See schema documentation - https://github.com/dotnet/arcade/blob/master/Documentation/AzureDevOps/TemplateSchema.md @@ -68,6 +69,9 @@ jobs: ${{ if ne(parameters.timeoutInMinutes, '') }}: timeoutInMinutes: ${{ parameters.timeoutInMinutes }} + ${{ if ne(parameters.templateContext, '') }}: + templateContext: ${{ parameters.templateContext }} + variables: - ${{ if ne(parameters.enableTelemetry, 'false') }}: - name: DOTNET_CLI_TELEMETRY_PROFILE @@ -202,9 +206,11 @@ jobs: continueOnError: true condition: always() - ${{ if and(ne(parameters.artifacts.publish.logs, 'false'), ne(parameters.artifacts.publish.logs, '')) }}: - - publish: artifacts/log - artifact: ${{ coalesce(parameters.artifacts.publish.logs.name, 'Logs_Build_$(Agent.Os)_$(_BuildConfig)') }} - displayName: Publish logs + - task: 1ES.PublishPipelineArtifact@1 + inputs: + targetPath: 'artifacts/log' + artifactName: ${{ coalesce(parameters.artifacts.publish.logs.name, 'Logs_Build_$(Agent.Os)_$(_BuildConfig)') }} + displayName: 'Publish logs' continueOnError: true condition: always() @@ -249,7 +255,9 @@ jobs: IgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }} - ${{ if eq(parameters.enableBuildRetry, 'true') }}: - - publish: $(Build.SourcesDirectory)\eng\common\BuildConfiguration - artifact: BuildConfiguration - displayName: Publish build retry configuration - continueOnError: true + - task: 1ES.PublishPipelineArtifact@1 + inputs: + targetPath: '$(Build.SourcesDirectory)\eng\common\BuildConfiguration' + artifactName: 'BuildConfiguration' + displayName: 'Publish build retry configuration' + continueOnError: true \ No newline at end of file diff --git a/eng/common/templates-official/job/source-index-stage1.yml b/eng/common/templates-official/job/source-index-stage1.yml index 757af7c7c4f..53a9ef51fd8 100644 --- a/eng/common/templates-official/job/source-index-stage1.yml +++ b/eng/common/templates-official/job/source-index-stage1.yml @@ -1,6 +1,6 @@ parameters: runAsPublic: false - sourceIndexPackageVersion: 1.0.1-20231213.4 + sourceIndexPackageVersion: 1.0.1-20240129.2 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: [] diff --git a/eng/common/templates-official/steps/send-to-helix.yml b/eng/common/templates-official/steps/send-to-helix.yml index 3eb7e2d5f84..68fa739c4ab 100644 --- a/eng/common/templates-official/steps/send-to-helix.yml +++ b/eng/common/templates-official/steps/send-to-helix.yml @@ -5,6 +5,8 @@ parameters: HelixBuild: $(Build.BuildNumber) # required -- the build number Helix will use to identify this -- automatically set to the AzDO build number HelixTargetQueues: '' # required -- semicolon-delimited list of Helix queues to test on; see https://helix.dot.net/ for a list of queues HelixAccessToken: '' # required -- access token to make Helix API requests; should be provided by the appropriate variable group + HelixProjectPath: 'eng/common/helixpublish.proj' # optional -- path to the project file to build relative to BUILD_SOURCESDIRECTORY + HelixProjectArguments: '' # optional -- arguments passed to the build command HelixConfiguration: '' # optional -- additional property attached to a job HelixPreCommands: '' # optional -- commands to run before Helix work item execution HelixPostCommands: '' # optional -- commands to run after Helix work item execution @@ -29,7 +31,7 @@ parameters: continueOnError: false # optional -- determines whether to continue the build if the step errors; defaults to false steps: - - powershell: 'powershell "$env:BUILD_SOURCESDIRECTORY\eng\common\msbuild.ps1 $env:BUILD_SOURCESDIRECTORY\eng\common\helixpublish.proj /restore /p:TreatWarningsAsErrors=false /t:Test /bl:$env:BUILD_SOURCESDIRECTORY\artifacts\log\$env:BuildConfig\SendToHelix.binlog"' + - powershell: 'powershell "$env:BUILD_SOURCESDIRECTORY\eng\common\msbuild.ps1 $env:BUILD_SOURCESDIRECTORY/${{ parameters.HelixProjectPath }} /restore /p:TreatWarningsAsErrors=false ${{ parameters.HelixProjectArguments }} /t:Test /bl:$env:BUILD_SOURCESDIRECTORY\artifacts\log\$env:BuildConfig\SendToHelix.binlog"' displayName: ${{ parameters.DisplayNamePrefix }} (Windows) env: BuildConfig: $(_BuildConfig) @@ -59,7 +61,7 @@ steps: SYSTEM_ACCESSTOKEN: $(System.AccessToken) condition: and(${{ parameters.condition }}, eq(variables['Agent.Os'], 'Windows_NT')) continueOnError: ${{ parameters.continueOnError }} - - script: $BUILD_SOURCESDIRECTORY/eng/common/msbuild.sh $BUILD_SOURCESDIRECTORY/eng/common/helixpublish.proj /restore /p:TreatWarningsAsErrors=false /t:Test /bl:$BUILD_SOURCESDIRECTORY/artifacts/log/$BuildConfig/SendToHelix.binlog + - script: $BUILD_SOURCESDIRECTORY/eng/common/msbuild.sh $BUILD_SOURCESDIRECTORY/${{ parameters.HelixProjectPath }} /restore /p:TreatWarningsAsErrors=false ${{ parameters.HelixProjectArguments }} /t:Test /bl:$BUILD_SOURCESDIRECTORY/artifacts/log/$BuildConfig/SendToHelix.binlog displayName: ${{ parameters.DisplayNamePrefix }} (Unix) env: BuildConfig: $(_BuildConfig) diff --git a/eng/common/templates-official/steps/source-build.yml b/eng/common/templates-official/steps/source-build.yml index b1db70842f5..53ed57b6d48 100644 --- a/eng/common/templates-official/steps/source-build.yml +++ b/eng/common/templates-official/steps/source-build.yml @@ -94,6 +94,8 @@ steps: $baseOsArgs \ /p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \ /p:ArcadeBuildFromSource=true \ + /p:DotNetBuildSourceOnly=true \ + /p:DotNetBuildRepo=true \ /p:AssetManifestFileName=$assetManifestFileName displayName: Build diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index 01c0dd995e4..a3277bf15c5 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -15,6 +15,7 @@ parameters: timeoutInMinutes: '' variables: [] workspace: '' + templateContext: '' # Job base template specific parameters # See schema documentation - https://github.com/dotnet/arcade/blob/master/Documentation/AzureDevOps/TemplateSchema.md @@ -68,6 +69,9 @@ jobs: ${{ if ne(parameters.timeoutInMinutes, '') }}: timeoutInMinutes: ${{ parameters.timeoutInMinutes }} + ${{ if ne(parameters.templateContext, '') }}: + templateContext: ${{ parameters.templateContext }} + variables: - ${{ if ne(parameters.enableTelemetry, 'false') }}: - name: DOTNET_CLI_TELEMETRY_PROFILE diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 9bf873e3c25..a58aef2847e 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -856,7 +856,7 @@ function MSBuild-Core() { # When running on Azure Pipelines, override the returned exit code to avoid double logging. # Skip this when the build is a child of the VMR orchestrator build. - if ($ci -and $env:SYSTEM_TEAMPROJECT -ne $null -and !$productBuild -and $properties -notlike "*DotNetBuildRepo=true*") { + if ($ci -and $env:SYSTEM_TEAMPROJECT -ne $null -and !$productBuild -and -not($properties -like "*DotNetBuildRepo=true*")) { Write-PipelineSetResult -Result "Failed" -Message "msbuild execution failed." # Exiting with an exit code causes the azure pipelines task to log yet another "noise" error # The above Write-PipelineSetResult will cause the task to be marked as failure without adding yet another error diff --git a/global.json b/global.json index a8e3e3a3686..cf9e74e0ba5 100644 --- a/global.json +++ b/global.json @@ -31,7 +31,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24154.2", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24154.2" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24161.5", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24161.5" } } From 586684fb53d1020fef6074c35afc6587031f8e74 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 12 Mar 2024 09:33:33 -0700 Subject: [PATCH 097/568] [feature/9.x] Update dependencies from dotnet/diagnostics (#6191) * Update dependencies from https://github.com/dotnet/diagnostics build 20240305.1 Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe From Version 8.0.0-preview.24154.1 -> To Version 8.0.0-preview.24155.1 * Update dependencies from https://github.com/dotnet/diagnostics build 20240306.1 Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe From Version 8.0.0-preview.24154.1 -> To Version 8.0.0-preview.24156.1 * Update dependencies from https://github.com/dotnet/diagnostics build 20240307.1 Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe From Version 8.0.0-preview.24154.1 -> To Version 8.0.0-preview.24157.1 * Update dependencies from https://github.com/dotnet/diagnostics build 20240307.1 Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe From Version 8.0.0-preview.24154.1 -> To Version 8.0.0-preview.24157.1 * Update dependencies from https://github.com/dotnet/diagnostics build 20240307.1 Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe From Version 8.0.0-preview.24154.1 -> To Version 8.0.0-preview.24157.1 * Update dependencies from https://github.com/dotnet/diagnostics build 20240308.2 Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe From Version 8.0.0-preview.24154.1 -> To Version 8.0.0-preview.24158.2 * Update dependencies from https://github.com/dotnet/diagnostics build 20240311.1 Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe From Version 8.0.0-preview.24154.1 -> To Version 8.0.0-preview.24161.1 --------- Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dd76e48208c..827520e0d51 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore 1ee58ec0d8837ac310c9ef9e784a35bf3027dbd5 - + https://github.com/dotnet/diagnostics - 6b101c405ec30d8f841d74d8e416bd4ac2b19f7e + 9168a9ddc896c9eeab9b5579c0029052287ee1ec - + https://github.com/dotnet/diagnostics - 6b101c405ec30d8f841d74d8e416bd4ac2b19f7e + 9168a9ddc896c9eeab9b5579c0029052287ee1ec https://github.com/dotnet/command-line-api diff --git a/eng/Versions.props b/eng/Versions.props index 48d7f60c98e..63059efcdab 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24126.1 - 8.0.0-preview.24154.1 - 8.0.0-preview.24154.1 + 8.0.0-preview.24161.1 + 8.0.0-preview.24161.1 9.0.100-preview.3.24162.2 From 189cea7c6c56436948decfc6a1405d9dc4461221 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 13 Mar 2024 14:39:54 +0000 Subject: [PATCH 098/568] Update dependencies from https://github.com/dotnet/arcade build (#6237) [feature/9.x] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- eng/common/native/init-compiler.sh | 6 +++--- global.json | 4 ++-- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 827520e0d51..38ab4fd7560 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,29 +22,29 @@ https://github.com/dotnet/roslyn-analyzers d98dd32d7cd4274bea98b147032b73a4eb051f2c - + https://github.com/dotnet/arcade - 39839f3007d9f3bbabf7a4b6a96ef5dd6be9e5ac + 1c8e12b71c28f5dc6626b529b08abefdbb7ca6e8 - + https://github.com/dotnet/arcade - 39839f3007d9f3bbabf7a4b6a96ef5dd6be9e5ac + 1c8e12b71c28f5dc6626b529b08abefdbb7ca6e8 - + https://github.com/dotnet/arcade - 39839f3007d9f3bbabf7a4b6a96ef5dd6be9e5ac + 1c8e12b71c28f5dc6626b529b08abefdbb7ca6e8 - + https://github.com/dotnet/arcade - 39839f3007d9f3bbabf7a4b6a96ef5dd6be9e5ac + 1c8e12b71c28f5dc6626b529b08abefdbb7ca6e8 https://github.com/dotnet/installer 2c7352096e706974f428d9d54d5aba78e9734242 - + https://github.com/dotnet/arcade - 39839f3007d9f3bbabf7a4b6a96ef5dd6be9e5ac + 1c8e12b71c28f5dc6626b529b08abefdbb7ca6e8 https://github.com/dotnet/symstore diff --git a/eng/Versions.props b/eng/Versions.props index 63059efcdab..9bbf52b804f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,9 +48,9 @@ --> - 9.0.0-beta.24161.5 - 9.0.0-beta.24161.5 - 9.0.0-beta.24161.5 + 9.0.0-beta.24162.2 + 9.0.0-beta.24162.2 + 9.0.0-beta.24162.2 9.0.0-preview.3.24161.11 9.0.0-preview.3.24161.11 diff --git a/eng/common/native/init-compiler.sh b/eng/common/native/init-compiler.sh index f5c1ec7eafe..afdeb7a4d54 100644 --- a/eng/common/native/init-compiler.sh +++ b/eng/common/native/init-compiler.sh @@ -63,7 +63,7 @@ if [ -z "$CLR_CC" ]; then # Set default versions if [ -z "$majorVersion" ]; then # note: gcc (all versions) and clang versions higher than 6 do not have minor version in file name, if it is zero. - if [ "$compiler" = "clang" ]; then versions="17 16 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5" + if [ "$compiler" = "clang" ]; then versions="18 17 16 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5" elif [ "$compiler" = "gcc" ]; then versions="13 12 11 10 9 8 7 6 5 4.9"; fi for version in $versions; do @@ -125,8 +125,8 @@ if [ -z "$CC" ]; then exit 1 fi -# Only lld version >= 9 can be considered stable. lld doesn't support s390x. -if [ "$compiler" = "clang" ] && [ -n "$majorVersion" ] && [ "$majorVersion" -ge 9 ] && [ "$build_arch" != "s390x" ]; then +# Only lld version >= 9 can be considered stable. lld supports s390x starting from 18.0. +if [ "$compiler" = "clang" ] && [ -n "$majorVersion" ] && [ "$majorVersion" -ge 9 ] && ([ "$build_arch" != "s390x" ] || [ "$majorVersion" -ge 18 ]); then if "$CC" -fuse-ld=lld -Wl,--version >/dev/null 2>&1; then LDFLAGS="-fuse-ld=lld" fi diff --git a/global.json b/global.json index cf9e74e0ba5..5391c81d032 100644 --- a/global.json +++ b/global.json @@ -31,7 +31,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24161.5", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24161.5" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24162.2", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24162.2" } } From af2ed301ceb95007402fcf9de5c89a9aa75b990c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 13 Mar 2024 09:15:32 -0700 Subject: [PATCH 099/568] Update dependencies from https://github.com/dotnet/installer build (#6240) Microsoft.Dotnet.Sdk.Internal From Version 9.0.100-preview.3.24162.2 -> To Version 9.0.100-preview.3.24162.35 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 38ab4fd7560..7012067be18 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -38,9 +38,9 @@ https://github.com/dotnet/arcade 1c8e12b71c28f5dc6626b529b08abefdbb7ca6e8 - + https://github.com/dotnet/installer - 2c7352096e706974f428d9d54d5aba78e9734242 + aa15647b3c58f0075e4575b1e7ec010415607d39 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 9bbf52b804f..cc54dbcbd00 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -60,7 +60,7 @@ 8.0.0-preview.24161.1 8.0.0-preview.24161.1 - 9.0.100-preview.3.24162.2 + 9.0.100-preview.3.24162.35 9.0.0-preview.24161.1 From 0e5fcccc5e755ff41dbbd0cf42faea9be42e4653 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 13 Mar 2024 09:15:46 -0700 Subject: [PATCH 100/568] Update dependencies from https://github.com/dotnet/diagnostics build (#6236) Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe From Version 8.0.0-preview.24161.1 -> To Version 8.0.0-preview.24162.9 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7012067be18..83c824232ca 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore 1ee58ec0d8837ac310c9ef9e784a35bf3027dbd5 - + https://github.com/dotnet/diagnostics - 9168a9ddc896c9eeab9b5579c0029052287ee1ec + 270ca481f89df570b0a9e2487d8f0e4f2844801a - + https://github.com/dotnet/diagnostics - 9168a9ddc896c9eeab9b5579c0029052287ee1ec + 270ca481f89df570b0a9e2487d8f0e4f2844801a https://github.com/dotnet/command-line-api diff --git a/eng/Versions.props b/eng/Versions.props index cc54dbcbd00..a8f9a188c38 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24126.1 - 8.0.0-preview.24161.1 - 8.0.0-preview.24161.1 + 8.0.0-preview.24162.9 + 8.0.0-preview.24162.9 9.0.100-preview.3.24162.35 From e20a0fdb38ee9c1590927ed6cf97514624cb0e68 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 14 Mar 2024 14:50:59 +0000 Subject: [PATCH 101/568] Update dependencies from https://github.com/dotnet/arcade build (#6249) [feature/9.x] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 +++++++++---------- eng/Versions.props | 6 +++--- .../job/publish-build-assets.yml | 10 ++++++---- global.json | 4 ++-- 4 files changed, 21 insertions(+), 19 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 83c824232ca..0952f81ff5c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,29 +22,29 @@ https://github.com/dotnet/roslyn-analyzers d98dd32d7cd4274bea98b147032b73a4eb051f2c - + https://github.com/dotnet/arcade - 1c8e12b71c28f5dc6626b529b08abefdbb7ca6e8 + d8a997bd4a23c6d6fe7c785b3b440be7dd8463e9 - + https://github.com/dotnet/arcade - 1c8e12b71c28f5dc6626b529b08abefdbb7ca6e8 + d8a997bd4a23c6d6fe7c785b3b440be7dd8463e9 - + https://github.com/dotnet/arcade - 1c8e12b71c28f5dc6626b529b08abefdbb7ca6e8 + d8a997bd4a23c6d6fe7c785b3b440be7dd8463e9 - + https://github.com/dotnet/arcade - 1c8e12b71c28f5dc6626b529b08abefdbb7ca6e8 + d8a997bd4a23c6d6fe7c785b3b440be7dd8463e9 https://github.com/dotnet/installer aa15647b3c58f0075e4575b1e7ec010415607d39 - + https://github.com/dotnet/arcade - 1c8e12b71c28f5dc6626b529b08abefdbb7ca6e8 + d8a997bd4a23c6d6fe7c785b3b440be7dd8463e9 https://github.com/dotnet/symstore diff --git a/eng/Versions.props b/eng/Versions.props index a8f9a188c38..7597a49a324 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,9 +48,9 @@ --> - 9.0.0-beta.24162.2 - 9.0.0-beta.24162.2 - 9.0.0-beta.24162.2 + 9.0.0-beta.24164.1 + 9.0.0-beta.24164.1 + 9.0.0-beta.24164.1 9.0.0-preview.3.24161.11 9.0.0-preview.3.24161.11 diff --git a/eng/common/templates-official/job/publish-build-assets.yml b/eng/common/templates-official/job/publish-build-assets.yml index 5f54135569b..d72e4ea6d9f 100644 --- a/eng/common/templates-official/job/publish-build-assets.yml +++ b/eng/common/templates-official/job/publish-build-assets.yml @@ -98,14 +98,16 @@ jobs: inputs: targetType: inline script: | - Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value $(BARBuildId) - Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value "$(DefaultChannels)" - Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value $(IsStableBuild) + New-Item -Path "$(Build.StagingDirectory)/ReleaseConfigs" -ItemType Directory -Force + $filePath = "$(Build.StagingDirectory)/ReleaseConfigs/ReleaseConfigs.txt" + Add-Content -Path $filePath -Value $(BARBuildId) + Add-Content -Path $filePath -Value "$(DefaultChannels)" + Add-Content -Path $filePath -Value $(IsStableBuild) - task: 1ES.PublishBuildArtifacts@1 displayName: Publish ReleaseConfigs Artifact inputs: - PathtoPublish: '$(Build.StagingDirectory)/ReleaseConfigs.txt' + PathtoPublish: '$(Build.StagingDirectory)/ReleaseConfigs' PublishLocation: Container ArtifactName: ReleaseConfigs diff --git a/global.json b/global.json index 5391c81d032..8402ff72d4a 100644 --- a/global.json +++ b/global.json @@ -31,7 +31,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24162.2", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24162.2" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24164.1", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24164.1" } } From 0651455de5286abe10f8f3872225fc61e95d8cbc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 14 Mar 2024 15:00:39 +0000 Subject: [PATCH 102/568] Update dependencies from https://github.com/dotnet/diagnostics build (#6248) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0952f81ff5c..b870a84251e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore 1ee58ec0d8837ac310c9ef9e784a35bf3027dbd5 - + https://github.com/dotnet/diagnostics - 270ca481f89df570b0a9e2487d8f0e4f2844801a + 453e242d6abbcb5da3742340f1dbf76625d9077a - + https://github.com/dotnet/diagnostics - 270ca481f89df570b0a9e2487d8f0e4f2844801a + 453e242d6abbcb5da3742340f1dbf76625d9077a https://github.com/dotnet/command-line-api diff --git a/eng/Versions.props b/eng/Versions.props index 7597a49a324..1d6852e1b37 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24126.1 - 8.0.0-preview.24162.9 - 8.0.0-preview.24162.9 + 8.0.0-preview.24163.4 + 8.0.0-preview.24163.4 9.0.100-preview.3.24162.35 From 5589449d973dc643e84a7ede522f7395799a2385 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 17 Mar 2024 04:11:31 +0000 Subject: [PATCH 103/568] Update dependencies from https://github.com/dotnet/diagnostics build (#6264) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b870a84251e..88fd6f37fce 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore 1ee58ec0d8837ac310c9ef9e784a35bf3027dbd5 - + https://github.com/dotnet/diagnostics - 453e242d6abbcb5da3742340f1dbf76625d9077a + 45470ed0f50984c676f819a920ace8679201da03 - + https://github.com/dotnet/diagnostics - 453e242d6abbcb5da3742340f1dbf76625d9077a + 45470ed0f50984c676f819a920ace8679201da03 https://github.com/dotnet/command-line-api diff --git a/eng/Versions.props b/eng/Versions.props index 1d6852e1b37..f404b20b2f4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24126.1 - 8.0.0-preview.24163.4 - 8.0.0-preview.24163.4 + 8.0.0-preview.24165.1 + 8.0.0-preview.24165.1 9.0.100-preview.3.24162.35 From bc07a3cfd22c40487bda39c21a1298deae3ea134 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 17 Mar 2024 05:14:11 +0000 Subject: [PATCH 104/568] [feature/9.x] Update dependencies from dotnet/arcade (#6260) [feature/9.x] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- global.json | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 88fd6f37fce..22c93fd67b7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,29 +22,29 @@ https://github.com/dotnet/roslyn-analyzers d98dd32d7cd4274bea98b147032b73a4eb051f2c - + https://github.com/dotnet/arcade - d8a997bd4a23c6d6fe7c785b3b440be7dd8463e9 + ace00d8719b8d1fdfd0cc05f71bb9af216338d27 - + https://github.com/dotnet/arcade - d8a997bd4a23c6d6fe7c785b3b440be7dd8463e9 + ace00d8719b8d1fdfd0cc05f71bb9af216338d27 - + https://github.com/dotnet/arcade - d8a997bd4a23c6d6fe7c785b3b440be7dd8463e9 + ace00d8719b8d1fdfd0cc05f71bb9af216338d27 - + https://github.com/dotnet/arcade - d8a997bd4a23c6d6fe7c785b3b440be7dd8463e9 + ace00d8719b8d1fdfd0cc05f71bb9af216338d27 https://github.com/dotnet/installer aa15647b3c58f0075e4575b1e7ec010415607d39 - + https://github.com/dotnet/arcade - d8a997bd4a23c6d6fe7c785b3b440be7dd8463e9 + ace00d8719b8d1fdfd0cc05f71bb9af216338d27 https://github.com/dotnet/symstore diff --git a/eng/Versions.props b/eng/Versions.props index f404b20b2f4..cf90145190e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,9 +48,9 @@ --> - 9.0.0-beta.24164.1 - 9.0.0-beta.24164.1 - 9.0.0-beta.24164.1 + 9.0.0-beta.24165.6 + 9.0.0-beta.24165.6 + 9.0.0-beta.24165.6 9.0.0-preview.3.24161.11 9.0.0-preview.3.24161.11 diff --git a/global.json b/global.json index 8402ff72d4a..ef9090afed2 100644 --- a/global.json +++ b/global.json @@ -31,7 +31,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24164.1", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24164.1" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24165.6", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24165.6" } } From 17aa1689175017a56d09df683a6a68c411a1f0b9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 21 Mar 2024 11:38:54 -0700 Subject: [PATCH 105/568] [feature/9.x] Update dependencies from dotnet/installer (#6250) * Update dependencies from https://github.com/dotnet/installer build Microsoft.Dotnet.Sdk.Internal From Version 9.0.100-preview.3.24162.35 -> To Version 9.0.100-preview.3.24163.23 Dependency coherency updates Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0 From Version 9.0.0-preview.3.24161.11 -> To Version 9.0.0-preview.3.24162.20 (parent: Microsoft.Dotnet.Sdk.Internal * Update dependencies from https://github.com/dotnet/installer build Microsoft.Dotnet.Sdk.Internal From Version 9.0.100-preview.3.24162.35 -> To Version 9.0.100-preview.3.24164.5 Dependency coherency updates Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0 From Version 9.0.0-preview.3.24161.11 -> To Version 9.0.0-preview.3.24162.20 (parent: Microsoft.Dotnet.Sdk.Internal * Update dependencies from https://github.com/dotnet/installer build Microsoft.Dotnet.Sdk.Internal From Version 9.0.100-preview.3.24162.35 -> To Version 9.0.100-preview.3.24165.20 Dependency coherency updates Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0 From Version 9.0.0-preview.3.24161.11 -> To Version 9.0.0-preview.3.24163.1 (parent: Microsoft.Dotnet.Sdk.Internal * Update dependencies from https://github.com/dotnet/installer build Microsoft.Dotnet.Sdk.Internal From Version 9.0.100-preview.3.24162.35 -> To Version 9.0.100-preview.3.24165.20 Dependency coherency updates Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0 From Version 9.0.0-preview.3.24161.11 -> To Version 9.0.0-preview.3.24163.1 (parent: Microsoft.Dotnet.Sdk.Internal * Update dependencies from https://github.com/dotnet/installer build Microsoft.Dotnet.Sdk.Internal From Version 9.0.100-preview.3.24162.35 -> To Version 9.0.100-preview.3.24165.20 Dependency coherency updates Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0 From Version 9.0.0-preview.3.24161.11 -> To Version 9.0.0-preview.3.24163.1 (parent: Microsoft.Dotnet.Sdk.Internal * Update dependencies from https://github.com/dotnet/installer build Microsoft.Dotnet.Sdk.Internal From Version 9.0.100-preview.3.24162.35 -> To Version 9.0.100-preview.3.24165.20 Dependency coherency updates Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0 From Version 9.0.0-preview.3.24161.11 -> To Version 9.0.0-preview.3.24163.1 (parent: Microsoft.Dotnet.Sdk.Internal * Update dependencies from https://github.com/dotnet/installer build Microsoft.Dotnet.Sdk.Internal From Version 9.0.100-preview.3.24162.35 -> To Version 9.0.100-preview.3.24165.20 Dependency coherency updates Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0 From Version 9.0.0-preview.3.24161.11 -> To Version 9.0.0-preview.3.24163.1 (parent: Microsoft.Dotnet.Sdk.Internal * Update dependencies from https://github.com/dotnet/installer build Microsoft.Dotnet.Sdk.Internal From Version 9.0.100-preview.3.24162.35 -> To Version 9.0.100-preview.3.24165.20 Dependency coherency updates Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0 From Version 9.0.0-preview.3.24161.11 -> To Version 9.0.0-preview.3.24163.1 (parent: Microsoft.Dotnet.Sdk.Internal --------- Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 22c93fd67b7..08bd716a1d9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/aspnetcore - 1ee58ec0d8837ac310c9ef9e784a35bf3027dbd5 + 268a2dfc29b33e3fdb73cbac6eb198c05314d77e https://github.com/dotnet/diagnostics @@ -38,9 +38,9 @@ https://github.com/dotnet/arcade ace00d8719b8d1fdfd0cc05f71bb9af216338d27 - + https://github.com/dotnet/installer - aa15647b3c58f0075e4575b1e7ec010415607d39 + b40c44502deca1e7f51674b97b2d6ca2d5e0abac https://github.com/dotnet/arcade @@ -50,17 +50,17 @@ https://github.com/dotnet/symstore 12fbd806da23e09bdf12352266b4de7253677f29 - + https://github.com/dotnet/runtime - efa2b78175388a656893d0e9becc408d99afe445 + 596a1f7b6429fc06cf71465238cb349cab4edc35 - + https://github.com/dotnet/aspnetcore - 1ee58ec0d8837ac310c9ef9e784a35bf3027dbd5 + 268a2dfc29b33e3fdb73cbac6eb198c05314d77e - + https://github.com/dotnet/runtime - efa2b78175388a656893d0e9becc408d99afe445 + 596a1f7b6429fc06cf71465238cb349cab4edc35 diff --git a/eng/Versions.props b/eng/Versions.props index cf90145190e..211f7b8ecc3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,20 +52,20 @@ 9.0.0-beta.24165.6 9.0.0-beta.24165.6 - 9.0.0-preview.3.24161.11 - 9.0.0-preview.3.24161.11 + 9.0.0-preview.3.24163.1 + 9.0.0-preview.3.24163.1 2.0.0-beta4.24126.1 8.0.0-preview.24165.1 8.0.0-preview.24165.1 - 9.0.100-preview.3.24162.35 + 9.0.100-preview.3.24165.20 9.0.0-preview.24161.1 - 9.0.0-preview.3.24161.4 - 9.0.0-preview.3.24161.4 + 9.0.0-preview.3.24162.31 + 9.0.0-preview.3.24162.31 1.0.516101 From e775ecfeecac039e138c3554c246dc2b9916cea6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 21 Mar 2024 15:45:11 -0700 Subject: [PATCH 106/568] [feature/9.x] Update dependencies from dotnet/symstore (#6279) * Update dependencies from https://github.com/dotnet/symstore build Microsoft.FileFormats From Version 1.0.516101 -> To Version 1.0.516801 * Update dependencies from https://github.com/dotnet/symstore build Microsoft.FileFormats From Version 1.0.516101 -> To Version 1.0.516801 * Update dependencies from https://github.com/dotnet/symstore build Microsoft.FileFormats From Version 1.0.516101 -> To Version 1.0.517001 --------- Co-authored-by: dotnet-maestro[bot] Co-authored-by: kkeirstead <85592574+kkeirstead@users.noreply.github.com> --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 08bd716a1d9..d145093bcba 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -46,9 +46,9 @@ https://github.com/dotnet/arcade ace00d8719b8d1fdfd0cc05f71bb9af216338d27 - + https://github.com/dotnet/symstore - 12fbd806da23e09bdf12352266b4de7253677f29 + 3a8a570f6b53a077bcc62b8224089f3d23236c13 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 211f7b8ecc3..cd4dda68139 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -67,7 +67,7 @@ 9.0.0-preview.3.24162.31 9.0.0-preview.3.24162.31 - 1.0.516101 + 1.0.517001 $(MicrosoftNETCoreApp31Version) From cde30ecf2d6b94442174c3833ff3b34ed028ab82 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 22 Mar 2024 11:59:30 -0700 Subject: [PATCH 107/568] [feature/9.x] Update dependencies from dotnet/arcade (#6278) * Update dependencies from https://github.com/dotnet/arcade build Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.24165.6 -> To Version 9.0.0-beta.24168.3 * Update dependencies from https://github.com/dotnet/arcade build Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.24165.6 -> To Version 9.0.0-beta.24168.5 * Update dependencies from https://github.com/dotnet/arcade build Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.24165.6 -> To Version 9.0.0-beta.24170.7 * Update dependencies from https://github.com/dotnet/arcade build Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.24165.6 -> To Version 9.0.0-beta.24171.5 --------- Co-authored-by: dotnet-maestro[bot] Co-authored-by: kkeirstead <85592574+kkeirstead@users.noreply.github.com> --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- global.json | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d145093bcba..752547b3220 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,29 +22,29 @@ https://github.com/dotnet/roslyn-analyzers d98dd32d7cd4274bea98b147032b73a4eb051f2c - + https://github.com/dotnet/arcade - ace00d8719b8d1fdfd0cc05f71bb9af216338d27 + 742b88473823f1271366463ee9b57bea63677312 - + https://github.com/dotnet/arcade - ace00d8719b8d1fdfd0cc05f71bb9af216338d27 + 742b88473823f1271366463ee9b57bea63677312 - + https://github.com/dotnet/arcade - ace00d8719b8d1fdfd0cc05f71bb9af216338d27 + 742b88473823f1271366463ee9b57bea63677312 - + https://github.com/dotnet/arcade - ace00d8719b8d1fdfd0cc05f71bb9af216338d27 + 742b88473823f1271366463ee9b57bea63677312 https://github.com/dotnet/installer b40c44502deca1e7f51674b97b2d6ca2d5e0abac - + https://github.com/dotnet/arcade - ace00d8719b8d1fdfd0cc05f71bb9af216338d27 + 742b88473823f1271366463ee9b57bea63677312 https://github.com/dotnet/symstore diff --git a/eng/Versions.props b/eng/Versions.props index cd4dda68139..adc912b7ed4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,9 +48,9 @@ --> - 9.0.0-beta.24165.6 - 9.0.0-beta.24165.6 - 9.0.0-beta.24165.6 + 9.0.0-beta.24171.5 + 9.0.0-beta.24171.5 + 9.0.0-beta.24171.5 9.0.0-preview.3.24163.1 9.0.0-preview.3.24163.1 diff --git a/global.json b/global.json index ef9090afed2..7012bf372d4 100644 --- a/global.json +++ b/global.json @@ -31,7 +31,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24165.6", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24165.6" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24171.5", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24171.5" } } From 9badab3b89b2bfff3acb547d355d13fdd0aca1d2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 22 Mar 2024 12:00:57 -0700 Subject: [PATCH 108/568] [feature/9.x] Update dependencies from dotnet/roslyn-analyzers (#6266) * Update dependencies from https://github.com/dotnet/roslyn-analyzers build Microsoft.CodeAnalysis.NetAnalyzers From Version 9.0.0-preview.24161.1 -> To Version 9.0.0-preview.24165.2 * Update dependencies from https://github.com/dotnet/roslyn-analyzers build Microsoft.CodeAnalysis.NetAnalyzers From Version 9.0.0-preview.24161.1 -> To Version 9.0.0-preview.24165.2 * Update dependencies from https://github.com/dotnet/roslyn-analyzers build Microsoft.CodeAnalysis.NetAnalyzers From Version 9.0.0-preview.24161.1 -> To Version 9.0.0-preview.24165.2 * Update dependencies from https://github.com/dotnet/roslyn-analyzers build Microsoft.CodeAnalysis.NetAnalyzers From Version 9.0.0-preview.24161.1 -> To Version 9.0.0-preview.24165.2 * Update dependencies from https://github.com/dotnet/roslyn-analyzers build Microsoft.CodeAnalysis.NetAnalyzers From Version 9.0.0-preview.24161.1 -> To Version 9.0.0-preview.24169.2 * Update dependencies from https://github.com/dotnet/roslyn-analyzers build Microsoft.CodeAnalysis.NetAnalyzers From Version 9.0.0-preview.24161.1 -> To Version 9.0.0-preview.24170.2 * Update dependencies from https://github.com/dotnet/roslyn-analyzers build Microsoft.CodeAnalysis.NetAnalyzers From Version 9.0.0-preview.24161.1 -> To Version 9.0.0-preview.24170.2 --------- Co-authored-by: dotnet-maestro[bot] Co-authored-by: kkeirstead <85592574+kkeirstead@users.noreply.github.com> --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 752547b3220..ff4f62d9a9a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -18,9 +18,9 @@ - + https://github.com/dotnet/roslyn-analyzers - d98dd32d7cd4274bea98b147032b73a4eb051f2c + 29bdbf5df540dc13d4fe440a1ca7076c6ed65864 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index adc912b7ed4..405a8c261e8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -62,7 +62,7 @@ 9.0.100-preview.3.24165.20 - 9.0.0-preview.24161.1 + 9.0.0-preview.24170.2 9.0.0-preview.3.24162.31 9.0.0-preview.3.24162.31 From 45e7c2cc43d9a4e652857d47a412d07aec315d2f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 23 Mar 2024 14:19:11 +0000 Subject: [PATCH 109/568] Update dependencies from https://github.com/dotnet/arcade build (#6291) [feature/9.x] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- eng/common/templates-official/job/job.yml | 2 +- global.json | 4 ++-- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ff4f62d9a9a..b18dc01a43d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,29 +22,29 @@ https://github.com/dotnet/roslyn-analyzers 29bdbf5df540dc13d4fe440a1ca7076c6ed65864 - + https://github.com/dotnet/arcade - 742b88473823f1271366463ee9b57bea63677312 + c936d1bc358744730613d8ce54bc3e0294e5ea56 - + https://github.com/dotnet/arcade - 742b88473823f1271366463ee9b57bea63677312 + c936d1bc358744730613d8ce54bc3e0294e5ea56 - + https://github.com/dotnet/arcade - 742b88473823f1271366463ee9b57bea63677312 + c936d1bc358744730613d8ce54bc3e0294e5ea56 - + https://github.com/dotnet/arcade - 742b88473823f1271366463ee9b57bea63677312 + c936d1bc358744730613d8ce54bc3e0294e5ea56 https://github.com/dotnet/installer b40c44502deca1e7f51674b97b2d6ca2d5e0abac - + https://github.com/dotnet/arcade - 742b88473823f1271366463ee9b57bea63677312 + c936d1bc358744730613d8ce54bc3e0294e5ea56 https://github.com/dotnet/symstore diff --git a/eng/Versions.props b/eng/Versions.props index 405a8c261e8..88ac38744b5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,9 +48,9 @@ --> - 9.0.0-beta.24171.5 - 9.0.0-beta.24171.5 - 9.0.0-beta.24171.5 + 9.0.0-beta.24172.4 + 9.0.0-beta.24172.4 + 9.0.0-beta.24172.4 9.0.0-preview.3.24163.1 9.0.0-preview.3.24163.1 diff --git a/eng/common/templates-official/job/job.yml b/eng/common/templates-official/job/job.yml index dfc3c0cf07c..16727e2587b 100644 --- a/eng/common/templates-official/job/job.yml +++ b/eng/common/templates-official/job/job.yml @@ -128,7 +128,7 @@ jobs: - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - ${{ if eq(parameters.enableMicrobuild, 'true') }}: - - task: MicroBuildSigningPlugin@3 + - task: MicroBuildSigningPlugin@4 displayName: Install MicroBuild plugin inputs: signType: $(_SignType) diff --git a/global.json b/global.json index 7012bf372d4..12b33001a51 100644 --- a/global.json +++ b/global.json @@ -31,7 +31,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24171.5", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24171.5" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24172.4", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24172.4" } } From e5f8364453ba628a509d251ca678cd91b2d1893d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 25 Mar 2024 13:26:52 -0700 Subject: [PATCH 110/568] [feature/9.x] Update dependencies from dotnet/diagnostics (#6277) * Update dependencies from https://github.com/dotnet/diagnostics build Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe From Version 8.0.0-preview.24165.1 -> To Version 8.0.0-preview.24168.1 * Update dependencies from https://github.com/dotnet/diagnostics build Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe From Version 8.0.0-preview.24165.1 -> To Version 8.0.0-preview.24169.1 * Update dependencies from https://github.com/dotnet/diagnostics build Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe From Version 8.0.0-preview.24165.1 -> To Version 8.0.0-preview.24170.1 * Update dependencies from https://github.com/dotnet/diagnostics build Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe From Version 8.0.0-preview.24165.1 -> To Version 8.0.0-preview.24171.1 * Update dependencies from https://github.com/dotnet/diagnostics build Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe From Version 8.0.0-preview.24165.1 -> To Version 8.0.0-preview.24171.1 * Update dependencies from https://github.com/dotnet/diagnostics build Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe From Version 8.0.0-preview.24165.1 -> To Version 8.0.0-preview.24171.1 * Update dependencies from https://github.com/dotnet/diagnostics build Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe From Version 8.0.0-preview.24165.1 -> To Version 8.0.0-preview.24172.1 --------- Co-authored-by: dotnet-maestro[bot] Co-authored-by: kkeirstead <85592574+kkeirstead@users.noreply.github.com> --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b18dc01a43d..ae6f55e4ffb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore 268a2dfc29b33e3fdb73cbac6eb198c05314d77e - + https://github.com/dotnet/diagnostics - 45470ed0f50984c676f819a920ace8679201da03 + 217abce2d2f1a253795231925b049b1171f151ea - + https://github.com/dotnet/diagnostics - 45470ed0f50984c676f819a920ace8679201da03 + 217abce2d2f1a253795231925b049b1171f151ea https://github.com/dotnet/command-line-api diff --git a/eng/Versions.props b/eng/Versions.props index 88ac38744b5..f665ebe7c3f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24126.1 - 8.0.0-preview.24165.1 - 8.0.0-preview.24165.1 + 8.0.0-preview.24172.1 + 8.0.0-preview.24172.1 9.0.100-preview.3.24165.20 From bcef8822028aedef6cab586cf61ef1692aae1920 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 25 Mar 2024 15:54:55 -0700 Subject: [PATCH 111/568] [feature/9.x] Update dependencies from dotnet/installer (#6292) * Update dependencies from https://github.com/dotnet/installer build Microsoft.Dotnet.Sdk.Internal From Version 9.0.100-preview.3.24165.20 -> To Version 9.0.100-preview.4.24172.18 * Update dependencies from https://github.com/dotnet/installer build Microsoft.Dotnet.Sdk.Internal From Version 9.0.100-preview.3.24165.20 -> To Version 9.0.100-preview.4.24174.1 Dependency coherency updates Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0 From Version 9.0.0-preview.3.24163.1 -> To Version 9.0.0-preview.4.24173.2 (parent: Microsoft.Dotnet.Sdk.Internal * Update dependencies from https://github.com/dotnet/installer build Microsoft.Dotnet.Sdk.Internal From Version 9.0.100-preview.3.24165.20 -> To Version 9.0.100-preview.4.24175.4 Dependency coherency updates Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0 From Version 9.0.0-preview.3.24163.1 -> To Version 9.0.0-preview.4.24173.3 (parent: Microsoft.Dotnet.Sdk.Internal --------- Co-authored-by: dotnet-maestro[bot] Co-authored-by: kkeirstead <85592574+kkeirstead@users.noreply.github.com> --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ae6f55e4ffb..965264741c5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/aspnetcore - 268a2dfc29b33e3fdb73cbac6eb198c05314d77e + 3f99d45b0b7d8f0427a3d98acc63098694613362 https://github.com/dotnet/diagnostics @@ -38,9 +38,9 @@ https://github.com/dotnet/arcade c936d1bc358744730613d8ce54bc3e0294e5ea56 - + https://github.com/dotnet/installer - b40c44502deca1e7f51674b97b2d6ca2d5e0abac + e39c438bf28021a6d041b93684a92103616b83ce https://github.com/dotnet/arcade @@ -50,17 +50,17 @@ https://github.com/dotnet/symstore 3a8a570f6b53a077bcc62b8224089f3d23236c13 - + https://github.com/dotnet/runtime - 596a1f7b6429fc06cf71465238cb349cab4edc35 + 17f8138a726b8af269bffc59e9baa12dcb7abca5 - + https://github.com/dotnet/aspnetcore - 268a2dfc29b33e3fdb73cbac6eb198c05314d77e + 3f99d45b0b7d8f0427a3d98acc63098694613362 - + https://github.com/dotnet/runtime - 596a1f7b6429fc06cf71465238cb349cab4edc35 + 17f8138a726b8af269bffc59e9baa12dcb7abca5 diff --git a/eng/Versions.props b/eng/Versions.props index f665ebe7c3f..a3725fda94a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,20 +52,20 @@ 9.0.0-beta.24172.4 9.0.0-beta.24172.4 - 9.0.0-preview.3.24163.1 - 9.0.0-preview.3.24163.1 + 9.0.0-preview.4.24173.3 + 9.0.0-preview.4.24173.3 2.0.0-beta4.24126.1 8.0.0-preview.24172.1 8.0.0-preview.24172.1 - 9.0.100-preview.3.24165.20 + 9.0.100-preview.4.24175.4 9.0.0-preview.24170.2 - 9.0.0-preview.3.24162.31 - 9.0.0-preview.3.24162.31 + 9.0.0-preview.4.24173.6 + 9.0.0-preview.4.24173.6 1.0.517001 From 1eb1efbd1ceb7ed0a92ae953069a8c8611e218cd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 27 Mar 2024 15:07:50 +0000 Subject: [PATCH 112/568] Update dependencies from https://github.com/dotnet/diagnostics build 20240326.3 (#6324) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 965264741c5..1c3aea90f2a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore 3f99d45b0b7d8f0427a3d98acc63098694613362 - + https://github.com/dotnet/diagnostics - 217abce2d2f1a253795231925b049b1171f151ea + 045a07e97ac08d34d769db53c1b28266159bcea2 - + https://github.com/dotnet/diagnostics - 217abce2d2f1a253795231925b049b1171f151ea + 045a07e97ac08d34d769db53c1b28266159bcea2 https://github.com/dotnet/command-line-api diff --git a/eng/Versions.props b/eng/Versions.props index a3725fda94a..add186d5a28 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24126.1 - 8.0.0-preview.24172.1 - 8.0.0-preview.24172.1 + 8.0.0-preview.24176.3 + 8.0.0-preview.24176.3 9.0.100-preview.4.24175.4 From ebc7c1d2e4e82f83af6c8f51797ba8932a7bb12c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 27 Mar 2024 15:24:36 +0000 Subject: [PATCH 113/568] Update dependencies from https://github.com/dotnet/arcade build 20240326.6 (#6325) [feature/9.x] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- eng/common/native/init-distro-rid.sh | 2 +- eng/common/templates-official/job/job.yml | 1 + global.json | 4 ++-- 5 files changed, 17 insertions(+), 16 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1c3aea90f2a..bdb82fea9cc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,29 +22,29 @@ https://github.com/dotnet/roslyn-analyzers 29bdbf5df540dc13d4fe440a1ca7076c6ed65864 - + https://github.com/dotnet/arcade - c936d1bc358744730613d8ce54bc3e0294e5ea56 + b6fada3ec4fa37e08dcbafaa6ddf59213f3f8687 - + https://github.com/dotnet/arcade - c936d1bc358744730613d8ce54bc3e0294e5ea56 + b6fada3ec4fa37e08dcbafaa6ddf59213f3f8687 - + https://github.com/dotnet/arcade - c936d1bc358744730613d8ce54bc3e0294e5ea56 + b6fada3ec4fa37e08dcbafaa6ddf59213f3f8687 - + https://github.com/dotnet/arcade - c936d1bc358744730613d8ce54bc3e0294e5ea56 + b6fada3ec4fa37e08dcbafaa6ddf59213f3f8687 https://github.com/dotnet/installer e39c438bf28021a6d041b93684a92103616b83ce - + https://github.com/dotnet/arcade - c936d1bc358744730613d8ce54bc3e0294e5ea56 + b6fada3ec4fa37e08dcbafaa6ddf59213f3f8687 https://github.com/dotnet/symstore diff --git a/eng/Versions.props b/eng/Versions.props index add186d5a28..bb7cc54e8e0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,9 +48,9 @@ --> - 9.0.0-beta.24172.4 - 9.0.0-beta.24172.4 - 9.0.0-beta.24172.4 + 9.0.0-beta.24176.6 + 9.0.0-beta.24176.6 + 9.0.0-beta.24176.6 9.0.0-preview.4.24173.3 9.0.0-preview.4.24173.3 diff --git a/eng/common/native/init-distro-rid.sh b/eng/common/native/init-distro-rid.sh index 5dcbfd700f0..228be0b1598 100644 --- a/eng/common/native/init-distro-rid.sh +++ b/eng/common/native/init-distro-rid.sh @@ -20,7 +20,7 @@ getNonPortableDistroRid() # shellcheck disable=SC1091 if [ -e "${rootfsDir}/etc/os-release" ]; then . "${rootfsDir}/etc/os-release" - if [ "${ID}" = "rhel" ] || [ "${ID}" = "rocky" ] || [ "${ID}" = "alpine" ]; then + if [ "${ID}" = "rhel" ] || [ "${ID}" = "rocky" ] || [ "${ID}" = "alpine" ] || [ "${ID}" = "ol" ]; then VERSION_ID="${VERSION_ID%.*}" # Remove the last version digit for these distros fi diff --git a/eng/common/templates-official/job/job.yml b/eng/common/templates-official/job/job.yml index 16727e2587b..c63e17e863e 100644 --- a/eng/common/templates-official/job/job.yml +++ b/eng/common/templates-official/job/job.yml @@ -136,6 +136,7 @@ jobs: feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json env: TeamName: $(_TeamName) + MicroBuildOutputFolderOverride: '$(Agent.TempDirectory)' continueOnError: ${{ parameters.continueOnError }} condition: and(succeeded(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT')) diff --git a/global.json b/global.json index 12b33001a51..58b0e0bcddd 100644 --- a/global.json +++ b/global.json @@ -31,7 +31,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24172.4", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24172.4" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24176.6", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24176.6" } } From cf22a5a5dc57b96adf8361f2e71c4e914fb73ef4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 27 Mar 2024 09:37:18 -0700 Subject: [PATCH 114/568] Update dependencies from https://github.com/dotnet/symstore build 20240325.1 (#6326) Microsoft.FileFormats From Version 1.0.517001 -> To Version 1.0.517501 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bdb82fea9cc..37188317337 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -46,9 +46,9 @@ https://github.com/dotnet/arcade b6fada3ec4fa37e08dcbafaa6ddf59213f3f8687 - + https://github.com/dotnet/symstore - 3a8a570f6b53a077bcc62b8224089f3d23236c13 + 550601c12a227c87ded32316345934101a8a2422 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index bb7cc54e8e0..e2e3fff06a9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -67,7 +67,7 @@ 9.0.0-preview.4.24173.6 9.0.0-preview.4.24173.6 - 1.0.517001 + 1.0.517501 $(MicrosoftNETCoreApp31Version) From 09fc816ca1109e277de336cf16be16bb62183f14 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 27 Mar 2024 09:38:17 -0700 Subject: [PATCH 115/568] Update dependencies from https://github.com/dotnet/installer build 20240327.2 (#6328) Microsoft.Dotnet.Sdk.Internal From Version 9.0.100-preview.4.24175.4 -> To Version 9.0.100-preview.4.24177.2 Dependency coherency updates Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.NetCore.SharedFramework.x64.9.0 From Version 9.0.0-preview.4.24173.6 -> To Version 9.0.0-preview.4.24176.9 (parent: Microsoft.Dotnet.Sdk.Internal Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 37188317337..8644424648c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -38,9 +38,9 @@ https://github.com/dotnet/arcade b6fada3ec4fa37e08dcbafaa6ddf59213f3f8687 - + https://github.com/dotnet/installer - e39c438bf28021a6d041b93684a92103616b83ce + 5b126d785162534f50d7fbb1ada827060d38c6d8 https://github.com/dotnet/arcade @@ -50,17 +50,17 @@ https://github.com/dotnet/symstore 550601c12a227c87ded32316345934101a8a2422 - + https://github.com/dotnet/runtime - 17f8138a726b8af269bffc59e9baa12dcb7abca5 + e04d9aa773e18b4946e0dce27a8877828c73d226 https://github.com/dotnet/aspnetcore 3f99d45b0b7d8f0427a3d98acc63098694613362 - + https://github.com/dotnet/runtime - 17f8138a726b8af269bffc59e9baa12dcb7abca5 + e04d9aa773e18b4946e0dce27a8877828c73d226 diff --git a/eng/Versions.props b/eng/Versions.props index e2e3fff06a9..09e61936cce 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -60,12 +60,12 @@ 8.0.0-preview.24176.3 8.0.0-preview.24176.3 - 9.0.100-preview.4.24175.4 + 9.0.100-preview.4.24177.2 9.0.0-preview.24170.2 - 9.0.0-preview.4.24173.6 - 9.0.0-preview.4.24173.6 + 9.0.0-preview.4.24176.9 + 9.0.0-preview.4.24176.9 1.0.517501 From db66e7afaabec69ad61239e1c069203fb1059112 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 27 Mar 2024 09:38:39 -0700 Subject: [PATCH 116/568] Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20240326.7 (#6329) Microsoft.CodeAnalysis.NetAnalyzers From Version 9.0.0-preview.24170.2 -> To Version 9.0.0-preview.24176.7 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8644424648c..3d321a45236 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -18,9 +18,9 @@ - + https://github.com/dotnet/roslyn-analyzers - 29bdbf5df540dc13d4fe440a1ca7076c6ed65864 + e110f0980519ea7b4cb7d50cb4dd030e83721bab https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 09e61936cce..c1f0143d397 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -62,7 +62,7 @@ 9.0.100-preview.4.24177.2 - 9.0.0-preview.24170.2 + 9.0.0-preview.24176.7 9.0.0-preview.4.24176.9 9.0.0-preview.4.24176.9 From 0966d047d750080c85c68c8de61efdff284fa1a6 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 27 Mar 2024 12:14:34 -0700 Subject: [PATCH 117/568] [feature/9.x] Update release version (#6318) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index c1f0143d397..bd78d70049e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -5,7 +5,7 @@ https://github.com/dotnet/dotnet-monitor 9.0.0 preview - 1 + 3 true 2.0.0-beta4.24126.1 - 8.0.0-preview.24176.3 - 8.0.0-preview.24176.3 + 8.0.0-preview.24177.3 + 8.0.0-preview.24177.3 9.0.100-preview.4.24177.2 From 8129386962ad97f986cc04040806978c736cf223 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 28 Mar 2024 15:41:35 +0000 Subject: [PATCH 119/568] Update dependencies from https://github.com/dotnet/arcade build 20240327.2 (#6337) [feature/9.x] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- global.json | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7ac24b563fa..8f6634279de 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,29 +22,29 @@ https://github.com/dotnet/roslyn-analyzers e110f0980519ea7b4cb7d50cb4dd030e83721bab - + https://github.com/dotnet/arcade - b6fada3ec4fa37e08dcbafaa6ddf59213f3f8687 + 689fb2d1b620a9df28c3384d9b208e3654a0f928 - + https://github.com/dotnet/arcade - b6fada3ec4fa37e08dcbafaa6ddf59213f3f8687 + 689fb2d1b620a9df28c3384d9b208e3654a0f928 - + https://github.com/dotnet/arcade - b6fada3ec4fa37e08dcbafaa6ddf59213f3f8687 + 689fb2d1b620a9df28c3384d9b208e3654a0f928 - + https://github.com/dotnet/arcade - b6fada3ec4fa37e08dcbafaa6ddf59213f3f8687 + 689fb2d1b620a9df28c3384d9b208e3654a0f928 https://github.com/dotnet/installer 5b126d785162534f50d7fbb1ada827060d38c6d8 - + https://github.com/dotnet/arcade - b6fada3ec4fa37e08dcbafaa6ddf59213f3f8687 + 689fb2d1b620a9df28c3384d9b208e3654a0f928 https://github.com/dotnet/symstore diff --git a/eng/Versions.props b/eng/Versions.props index 54e581c8735..f90688d4b76 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,9 +48,9 @@ --> - 9.0.0-beta.24176.6 - 9.0.0-beta.24176.6 - 9.0.0-beta.24176.6 + 9.0.0-beta.24177.2 + 9.0.0-beta.24177.2 + 9.0.0-beta.24177.2 9.0.0-preview.4.24173.3 9.0.0-preview.4.24173.3 diff --git a/global.json b/global.json index 58b0e0bcddd..1f887bd2485 100644 --- a/global.json +++ b/global.json @@ -31,7 +31,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24176.6", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24176.6" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24177.2", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24177.2" } } From 76a9c0bcd595b6f8d85cafb551d04f9ea83e3726 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 28 Mar 2024 09:20:44 -0700 Subject: [PATCH 120/568] Update dependencies from https://github.com/dotnet/installer build 20240328.1 (#6339) Microsoft.Dotnet.Sdk.Internal From Version 9.0.100-preview.4.24177.2 -> To Version 9.0.100-preview.4.24178.1 Dependency coherency updates Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0 From Version 9.0.0-preview.4.24173.3 -> To Version 9.0.0-preview.4.24176.7 (parent: Microsoft.Dotnet.Sdk.Internal Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8f6634279de..b802758c0d3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/aspnetcore - 3f99d45b0b7d8f0427a3d98acc63098694613362 + 63c8031b6a6af5009b3c5bb4291fcc4c32b06b10 https://github.com/dotnet/diagnostics @@ -38,9 +38,9 @@ https://github.com/dotnet/arcade 689fb2d1b620a9df28c3384d9b208e3654a0f928 - + https://github.com/dotnet/installer - 5b126d785162534f50d7fbb1ada827060d38c6d8 + 279a8df3896bcff19c8aa6fa6f9d24c73949fc01 https://github.com/dotnet/arcade @@ -50,17 +50,17 @@ https://github.com/dotnet/symstore 550601c12a227c87ded32316345934101a8a2422 - + https://github.com/dotnet/runtime - e04d9aa773e18b4946e0dce27a8877828c73d226 + c46410f099b6358461d2de89f81393c91d2b40f7 - + https://github.com/dotnet/aspnetcore - 3f99d45b0b7d8f0427a3d98acc63098694613362 + 63c8031b6a6af5009b3c5bb4291fcc4c32b06b10 - + https://github.com/dotnet/runtime - e04d9aa773e18b4946e0dce27a8877828c73d226 + c46410f099b6358461d2de89f81393c91d2b40f7 diff --git a/eng/Versions.props b/eng/Versions.props index f90688d4b76..2b622ced8e3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,20 +52,20 @@ 9.0.0-beta.24177.2 9.0.0-beta.24177.2 - 9.0.0-preview.4.24173.3 - 9.0.0-preview.4.24173.3 + 9.0.0-preview.4.24176.7 + 9.0.0-preview.4.24176.7 2.0.0-beta4.24126.1 8.0.0-preview.24177.3 8.0.0-preview.24177.3 - 9.0.100-preview.4.24177.2 + 9.0.100-preview.4.24178.1 9.0.0-preview.24176.7 - 9.0.0-preview.4.24176.9 - 9.0.0-preview.4.24176.9 + 9.0.0-preview.4.24176.12 + 9.0.0-preview.4.24176.12 1.0.517501 From c04d776089923bb81a7bd115ac292c2633b5ea7d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 28 Mar 2024 09:21:03 -0700 Subject: [PATCH 121/568] Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20240327.1 (#6340) Microsoft.CodeAnalysis.NetAnalyzers From Version 9.0.0-preview.24176.7 -> To Version 9.0.0-preview.24177.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b802758c0d3..162397091a4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -18,9 +18,9 @@ - + https://github.com/dotnet/roslyn-analyzers - e110f0980519ea7b4cb7d50cb4dd030e83721bab + ad732e236e7ffcb66de4b45a1b736aad4ccdcd83 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 2b622ced8e3..dd2a324950d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -62,7 +62,7 @@ 9.0.100-preview.4.24178.1 - 9.0.0-preview.24176.7 + 9.0.0-preview.24177.1 9.0.0-preview.4.24176.12 9.0.0-preview.4.24176.12 From e40609a0731cf5d0287255cf435c4299c3a0f7fc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 29 Mar 2024 14:46:10 +0000 Subject: [PATCH 122/568] Update dependencies from https://github.com/dotnet/diagnostics build 20240328.4 (#6350) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 162397091a4..67551b4ae24 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,11 +4,11 @@ https://github.com/dotnet/aspnetcore 63c8031b6a6af5009b3c5bb4291fcc4c32b06b10 - + https://github.com/dotnet/diagnostics 045a07e97ac08d34d769db53c1b28266159bcea2 - + https://github.com/dotnet/diagnostics 045a07e97ac08d34d769db53c1b28266159bcea2 diff --git a/eng/Versions.props b/eng/Versions.props index dd2a324950d..67bd1495f8f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24126.1 - 8.0.0-preview.24177.3 - 8.0.0-preview.24177.3 + 8.0.0-preview.24178.4 + 8.0.0-preview.24178.4 9.0.100-preview.4.24178.1 From 68015dc25a03226a49367f519daf6617f3e0e4b8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 29 Mar 2024 14:52:25 +0000 Subject: [PATCH 123/568] Update dependencies from https://github.com/dotnet/arcade build 20240328.6 (#6351) [feature/9.x] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 +++++++++---------- eng/Versions.props | 6 +++--- .../job/publish-build-assets.yml | 4 ++-- .../post-build/post-build.yml | 4 ++-- global.json | 4 ++-- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 67551b4ae24..f7cdd256187 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,29 +22,29 @@ https://github.com/dotnet/roslyn-analyzers ad732e236e7ffcb66de4b45a1b736aad4ccdcd83 - + https://github.com/dotnet/arcade - 689fb2d1b620a9df28c3384d9b208e3654a0f928 + 4345e14684eab24fa2f8217706756dd7c0787d84 - + https://github.com/dotnet/arcade - 689fb2d1b620a9df28c3384d9b208e3654a0f928 + 4345e14684eab24fa2f8217706756dd7c0787d84 - + https://github.com/dotnet/arcade - 689fb2d1b620a9df28c3384d9b208e3654a0f928 + 4345e14684eab24fa2f8217706756dd7c0787d84 - + https://github.com/dotnet/arcade - 689fb2d1b620a9df28c3384d9b208e3654a0f928 + 4345e14684eab24fa2f8217706756dd7c0787d84 https://github.com/dotnet/installer 279a8df3896bcff19c8aa6fa6f9d24c73949fc01 - + https://github.com/dotnet/arcade - 689fb2d1b620a9df28c3384d9b208e3654a0f928 + 4345e14684eab24fa2f8217706756dd7c0787d84 https://github.com/dotnet/symstore diff --git a/eng/Versions.props b/eng/Versions.props index 67bd1495f8f..dc162c7a036 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,9 +48,9 @@ --> - 9.0.0-beta.24177.2 - 9.0.0-beta.24177.2 - 9.0.0-beta.24177.2 + 9.0.0-beta.24178.6 + 9.0.0-beta.24178.6 + 9.0.0-beta.24178.6 9.0.0-preview.4.24176.7 9.0.0-preview.4.24176.7 diff --git a/eng/common/templates-official/job/publish-build-assets.yml b/eng/common/templates-official/job/publish-build-assets.yml index d72e4ea6d9f..38340d3e386 100644 --- a/eng/common/templates-official/job/publish-build-assets.yml +++ b/eng/common/templates-official/job/publish-build-assets.yml @@ -60,8 +60,8 @@ jobs: os: windows # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: - name: $(DncEngInternalBuildPool) - image: 1es-windows-2022-pt + name: NetCore1ESPool-Publishing-Internal + image: windows.vs2019.amd64 os: windows steps: - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: diff --git a/eng/common/templates-official/post-build/post-build.yml b/eng/common/templates-official/post-build/post-build.yml index 5c98fe1c0f3..d286e956bdf 100644 --- a/eng/common/templates-official/post-build/post-build.yml +++ b/eng/common/templates-official/post-build/post-build.yml @@ -261,8 +261,8 @@ stages: os: windows # If it's not devdiv, it's dnceng ${{ else }}: - name: $(DncEngInternalBuildPool) - image: 1es-windows-2022-pt + name: NetCore1ESPool-Publishing-Internal + image: windows.vs2019.amd64 os: windows steps: - template: setup-maestro-vars.yml diff --git a/global.json b/global.json index 1f887bd2485..cfb3a56f723 100644 --- a/global.json +++ b/global.json @@ -31,7 +31,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24177.2", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24177.2" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24178.6", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24178.6" } } From dea22ff09bf5cc3d5b7f8c663390bd4a0bea1359 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 29 Mar 2024 09:46:04 -0700 Subject: [PATCH 124/568] Update dependencies from https://github.com/dotnet/installer build 20240328.10 (#6352) Microsoft.Dotnet.Sdk.Internal From Version 9.0.100-preview.4.24178.1 -> To Version 9.0.100-preview.4.24178.10 Dependency coherency updates Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0 From Version 9.0.0-preview.4.24176.7 -> To Version 9.0.0-preview.4.24177.3 (parent: Microsoft.Dotnet.Sdk.Internal Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f7cdd256187..4c8650f07a1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/aspnetcore - 63c8031b6a6af5009b3c5bb4291fcc4c32b06b10 + 1c8f20be1fc4e97044d7ca93edae3af528bc3521 https://github.com/dotnet/diagnostics @@ -38,9 +38,9 @@ https://github.com/dotnet/arcade 4345e14684eab24fa2f8217706756dd7c0787d84 - + https://github.com/dotnet/installer - 279a8df3896bcff19c8aa6fa6f9d24c73949fc01 + 6cb99adb7aea19d43c6af6aecae7526dfe61d763 https://github.com/dotnet/arcade @@ -50,17 +50,17 @@ https://github.com/dotnet/symstore 550601c12a227c87ded32316345934101a8a2422 - + https://github.com/dotnet/runtime - c46410f099b6358461d2de89f81393c91d2b40f7 + e612bf4d0b6f08623092902c34a504e932388664 - + https://github.com/dotnet/aspnetcore - 63c8031b6a6af5009b3c5bb4291fcc4c32b06b10 + 1c8f20be1fc4e97044d7ca93edae3af528bc3521 - + https://github.com/dotnet/runtime - c46410f099b6358461d2de89f81393c91d2b40f7 + e612bf4d0b6f08623092902c34a504e932388664 diff --git a/eng/Versions.props b/eng/Versions.props index dc162c7a036..6f100d4dc5a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,20 +52,20 @@ 9.0.0-beta.24178.6 9.0.0-beta.24178.6 - 9.0.0-preview.4.24176.7 - 9.0.0-preview.4.24176.7 + 9.0.0-preview.4.24177.3 + 9.0.0-preview.4.24177.3 2.0.0-beta4.24126.1 8.0.0-preview.24178.4 8.0.0-preview.24178.4 - 9.0.100-preview.4.24178.1 + 9.0.100-preview.4.24178.10 9.0.0-preview.24177.1 - 9.0.0-preview.4.24176.12 - 9.0.0-preview.4.24176.12 + 9.0.0-preview.4.24178.3 + 9.0.0-preview.4.24178.3 1.0.517501 From f4cead661e3c2e47bb3a202bce1c9f811a9f7933 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 29 Mar 2024 22:49:50 +0000 Subject: [PATCH 125/568] Update release information (#6360) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 6f100d4dc5a..6840339c808 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -5,7 +5,7 @@ https://github.com/dotnet/dotnet-monitor 9.0.0 preview - 3 + 4 true 2.0.0-beta4.24126.1 - 8.0.0-preview.24178.4 - 8.0.0-preview.24178.4 + 8.0.0-preview.24179.4 + 8.0.0-preview.24179.4 9.0.100-preview.4.24178.10 From 1c7a4908732171b0c9f8686c1e4f5ca9aafbf135 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 2 Apr 2024 09:16:49 -0700 Subject: [PATCH 127/568] Update dependencies from https://github.com/dotnet/arcade build 20240329.6 (#6363) Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.24178.6 -> To Version 9.0.0-beta.24179.6 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 20 +++++++++---------- eng/Versions.props | 6 +++--- .../templates-official/job/onelocbuild.yml | 2 +- .../templates-official/job/source-build.yml | 2 +- .../post-build/post-build.yml | 6 +++--- .../variables/pool-providers.yml | 2 +- global.json | 4 ++-- 7 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f08d11a4151..0ccc681aa7a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,29 +22,29 @@ https://github.com/dotnet/roslyn-analyzers ad732e236e7ffcb66de4b45a1b736aad4ccdcd83 - + https://github.com/dotnet/arcade - 4345e14684eab24fa2f8217706756dd7c0787d84 + 986a55a9c7f1ef547bc705d6adada5e0c2217819 - + https://github.com/dotnet/arcade - 4345e14684eab24fa2f8217706756dd7c0787d84 + 986a55a9c7f1ef547bc705d6adada5e0c2217819 - + https://github.com/dotnet/arcade - 4345e14684eab24fa2f8217706756dd7c0787d84 + 986a55a9c7f1ef547bc705d6adada5e0c2217819 - + https://github.com/dotnet/arcade - 4345e14684eab24fa2f8217706756dd7c0787d84 + 986a55a9c7f1ef547bc705d6adada5e0c2217819 https://github.com/dotnet/installer 6cb99adb7aea19d43c6af6aecae7526dfe61d763 - + https://github.com/dotnet/arcade - 4345e14684eab24fa2f8217706756dd7c0787d84 + 986a55a9c7f1ef547bc705d6adada5e0c2217819 https://github.com/dotnet/symstore diff --git a/eng/Versions.props b/eng/Versions.props index 720fac1de31..23eb4099314 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,9 +48,9 @@ --> - 9.0.0-beta.24178.6 - 9.0.0-beta.24178.6 - 9.0.0-beta.24178.6 + 9.0.0-beta.24179.6 + 9.0.0-beta.24179.6 + 9.0.0-beta.24179.6 9.0.0-preview.4.24177.3 9.0.0-preview.4.24177.3 diff --git a/eng/common/templates-official/job/onelocbuild.yml b/eng/common/templates-official/job/onelocbuild.yml index ba9ba493032..52b4d05d3f8 100644 --- a/eng/common/templates-official/job/onelocbuild.yml +++ b/eng/common/templates-official/job/onelocbuild.yml @@ -56,7 +56,7 @@ jobs: # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: name: $(DncEngInternalBuildPool) - image: 1es-windows-2022-pt + image: 1es-windows-2022 os: windows steps: diff --git a/eng/common/templates-official/job/source-build.yml b/eng/common/templates-official/job/source-build.yml index 50f04e642a3..50d4b98e201 100644 --- a/eng/common/templates-official/job/source-build.yml +++ b/eng/common/templates-official/job/source-build.yml @@ -52,7 +52,7 @@ jobs: ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')] - image: 1es-mariner-2-pt + image: 1es-mariner-2 os: linux ${{ if ne(parameters.platform.pool, '') }}: diff --git a/eng/common/templates-official/post-build/post-build.yml b/eng/common/templates-official/post-build/post-build.yml index d286e956bdf..da1f40958b4 100644 --- a/eng/common/templates-official/post-build/post-build.yml +++ b/eng/common/templates-official/post-build/post-build.yml @@ -110,7 +110,7 @@ stages: # If it's not devdiv, it's dnceng ${{ else }}: name: $(DncEngInternalBuildPool) - image: 1es-windows-2022-pt + image: 1es-windows-2022 os: windows steps: @@ -150,7 +150,7 @@ stages: # If it's not devdiv, it's dnceng ${{ else }}: name: $(DncEngInternalBuildPool) - image: 1es-windows-2022-pt + image: 1es-windows-2022 os: windows steps: - template: setup-maestro-vars.yml @@ -208,7 +208,7 @@ stages: # If it's not devdiv, it's dnceng ${{ else }}: name: $(DncEngInternalBuildPool) - image: 1es-windows-2022-pt + image: 1es-windows-2022 os: windows steps: - template: setup-maestro-vars.yml diff --git a/eng/common/templates-official/variables/pool-providers.yml b/eng/common/templates-official/variables/pool-providers.yml index beab7d1bfba..1f308b24efc 100644 --- a/eng/common/templates-official/variables/pool-providers.yml +++ b/eng/common/templates-official/variables/pool-providers.yml @@ -23,7 +23,7 @@ # # pool: # name: $(DncEngInternalBuildPool) -# image: 1es-windows-2022-pt +# image: 1es-windows-2022 variables: # Coalesce the target and source branches so we know when a PR targets a release branch diff --git a/global.json b/global.json index cfb3a56f723..ab0ec1adb21 100644 --- a/global.json +++ b/global.json @@ -31,7 +31,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24178.6", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24178.6" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24179.6", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24179.6" } } From cd8ca6852f0d106b3c5c3f9b748515081cc3406e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 2 Apr 2024 09:19:16 -0700 Subject: [PATCH 128/568] Update dependencies from https://github.com/dotnet/installer build 20240330.1 (#6365) Microsoft.Dotnet.Sdk.Internal From Version 9.0.100-preview.4.24178.10 -> To Version 9.0.100-preview.4.24180.1 Dependency coherency updates Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0 From Version 9.0.0-preview.4.24177.3 -> To Version 9.0.0-preview.4.24179.1 (parent: Microsoft.Dotnet.Sdk.Internal Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0ccc681aa7a..f2d320208df 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/aspnetcore - 1c8f20be1fc4e97044d7ca93edae3af528bc3521 + 57ede89c3f7139e402ffbe52923bad19416014a7 https://github.com/dotnet/diagnostics @@ -38,9 +38,9 @@ https://github.com/dotnet/arcade 986a55a9c7f1ef547bc705d6adada5e0c2217819 - + https://github.com/dotnet/installer - 6cb99adb7aea19d43c6af6aecae7526dfe61d763 + f57e4665bd583618f498af4bd8d53221f90fca88 https://github.com/dotnet/arcade @@ -50,17 +50,17 @@ https://github.com/dotnet/symstore 550601c12a227c87ded32316345934101a8a2422 - + https://github.com/dotnet/runtime - e612bf4d0b6f08623092902c34a504e932388664 + 83b0d939bedadf7d782b0b26307c2d8c1d5b76f4 - + https://github.com/dotnet/aspnetcore - 1c8f20be1fc4e97044d7ca93edae3af528bc3521 + 57ede89c3f7139e402ffbe52923bad19416014a7 - + https://github.com/dotnet/runtime - e612bf4d0b6f08623092902c34a504e932388664 + 83b0d939bedadf7d782b0b26307c2d8c1d5b76f4 diff --git a/eng/Versions.props b/eng/Versions.props index 23eb4099314..fb5fd8bd31c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,20 +52,20 @@ 9.0.0-beta.24179.6 9.0.0-beta.24179.6 - 9.0.0-preview.4.24177.3 - 9.0.0-preview.4.24177.3 + 9.0.0-preview.4.24179.1 + 9.0.0-preview.4.24179.1 2.0.0-beta4.24126.1 8.0.0-preview.24179.4 8.0.0-preview.24179.4 - 9.0.100-preview.4.24178.10 + 9.0.100-preview.4.24180.1 9.0.0-preview.24177.1 - 9.0.0-preview.4.24178.3 - 9.0.0-preview.4.24178.3 + 9.0.0-preview.4.24178.9 + 9.0.0-preview.4.24178.9 1.0.517501 From f9b43d383f157d7ea479dc66cd0c76a0f087c74e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 3 Apr 2024 14:40:34 +0000 Subject: [PATCH 129/568] Update dependencies from https://github.com/dotnet/diagnostics build 20240402.1 (#6374) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f2d320208df..3b49cf1dd97 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore 57ede89c3f7139e402ffbe52923bad19416014a7 - + https://github.com/dotnet/diagnostics - 2b1c839936cd3518e62b56971c15528141d72d5d + 99bbd46ec786710ed3b5a1339810ef33b3a508a0 - + https://github.com/dotnet/diagnostics - 2b1c839936cd3518e62b56971c15528141d72d5d + 99bbd46ec786710ed3b5a1339810ef33b3a508a0 https://github.com/dotnet/command-line-api diff --git a/eng/Versions.props b/eng/Versions.props index fb5fd8bd31c..8f8170d00bd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24126.1 - 8.0.0-preview.24179.4 - 8.0.0-preview.24179.4 + 8.0.0-preview.24202.1 + 8.0.0-preview.24202.1 9.0.100-preview.4.24180.1 From e9279b56a6d61e678247ed62bb3229bb1a4a6173 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 3 Apr 2024 14:49:47 +0000 Subject: [PATCH 130/568] Update dependencies from https://github.com/dotnet/arcade build 20240403.1 (#6376) [feature/9.x] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- global.json | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3b49cf1dd97..2e1ab999b1e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,29 +22,29 @@ https://github.com/dotnet/roslyn-analyzers ad732e236e7ffcb66de4b45a1b736aad4ccdcd83 - + https://github.com/dotnet/arcade - 986a55a9c7f1ef547bc705d6adada5e0c2217819 + 532f956a119bce77ca279994054d08dbc24418f7 - + https://github.com/dotnet/arcade - 986a55a9c7f1ef547bc705d6adada5e0c2217819 + 532f956a119bce77ca279994054d08dbc24418f7 - + https://github.com/dotnet/arcade - 986a55a9c7f1ef547bc705d6adada5e0c2217819 + 532f956a119bce77ca279994054d08dbc24418f7 - + https://github.com/dotnet/arcade - 986a55a9c7f1ef547bc705d6adada5e0c2217819 + 532f956a119bce77ca279994054d08dbc24418f7 https://github.com/dotnet/installer f57e4665bd583618f498af4bd8d53221f90fca88 - + https://github.com/dotnet/arcade - 986a55a9c7f1ef547bc705d6adada5e0c2217819 + 532f956a119bce77ca279994054d08dbc24418f7 https://github.com/dotnet/symstore diff --git a/eng/Versions.props b/eng/Versions.props index 8f8170d00bd..7aa5cf559f8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,9 +48,9 @@ --> - 9.0.0-beta.24179.6 - 9.0.0-beta.24179.6 - 9.0.0-beta.24179.6 + 9.0.0-beta.24203.1 + 9.0.0-beta.24203.1 + 9.0.0-beta.24203.1 9.0.0-preview.4.24179.1 9.0.0-preview.4.24179.1 diff --git a/global.json b/global.json index ab0ec1adb21..359f03fabef 100644 --- a/global.json +++ b/global.json @@ -31,7 +31,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24179.6", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24179.6" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24203.1", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24203.1" } } From 898635d68831b222f2667dbc68f2d694ae08a299 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 3 Apr 2024 14:50:58 +0000 Subject: [PATCH 131/568] Update dependencies from https://github.com/dotnet/command-line-api build 20240401.1 (#6375) [feature/9.x] Update dependencies from dotnet/command-line-api --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2e1ab999b1e..9077afdcdba 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -12,9 +12,9 @@ https://github.com/dotnet/diagnostics 99bbd46ec786710ed3b5a1339810ef33b3a508a0 - + https://github.com/dotnet/command-line-api - 5ea97af07263ea3ef68a18557c8aa3f7e3200bda + c96672b8b84c307feb035fed6cbe9db85d5b87d3 diff --git a/eng/Versions.props b/eng/Versions.props index 7aa5cf559f8..fc3e856e30f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,7 +55,7 @@ 9.0.0-preview.4.24179.1 9.0.0-preview.4.24179.1 - 2.0.0-beta4.24126.1 + 2.0.0-beta4.24201.1 8.0.0-preview.24202.1 8.0.0-preview.24202.1 From 16671cafda42f1ffea614b331645c2d0f1caf54f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 3 Apr 2024 10:13:55 -0700 Subject: [PATCH 132/568] Update dependencies from https://github.com/dotnet/installer build 20240403.3 (#6378) Microsoft.Dotnet.Sdk.Internal From Version 9.0.100-preview.4.24180.1 -> To Version 9.0.100-preview.4.24203.3 Dependency coherency updates Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0 From Version 9.0.0-preview.4.24179.1 -> To Version 9.0.0-preview.4.24202.2 (parent: Microsoft.Dotnet.Sdk.Internal Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9077afdcdba..28b8a7e42a1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/aspnetcore - 57ede89c3f7139e402ffbe52923bad19416014a7 + 4e75678e761c993ed85b108fab57353eeecf5245 https://github.com/dotnet/diagnostics @@ -38,9 +38,9 @@ https://github.com/dotnet/arcade 532f956a119bce77ca279994054d08dbc24418f7 - + https://github.com/dotnet/installer - f57e4665bd583618f498af4bd8d53221f90fca88 + 2db0e136e92659c88b099672002b0d8015070815 https://github.com/dotnet/arcade @@ -50,17 +50,17 @@ https://github.com/dotnet/symstore 550601c12a227c87ded32316345934101a8a2422 - + https://github.com/dotnet/runtime - 83b0d939bedadf7d782b0b26307c2d8c1d5b76f4 + 995989e8b33864648080c55e31116d9818b8760c - + https://github.com/dotnet/aspnetcore - 57ede89c3f7139e402ffbe52923bad19416014a7 + 4e75678e761c993ed85b108fab57353eeecf5245 - + https://github.com/dotnet/runtime - 83b0d939bedadf7d782b0b26307c2d8c1d5b76f4 + 995989e8b33864648080c55e31116d9818b8760c diff --git a/eng/Versions.props b/eng/Versions.props index fc3e856e30f..78ef0b333c0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,20 +52,20 @@ 9.0.0-beta.24203.1 9.0.0-beta.24203.1 - 9.0.0-preview.4.24179.1 - 9.0.0-preview.4.24179.1 + 9.0.0-preview.4.24202.2 + 9.0.0-preview.4.24202.2 2.0.0-beta4.24201.1 8.0.0-preview.24202.1 8.0.0-preview.24202.1 - 9.0.100-preview.4.24180.1 + 9.0.100-preview.4.24203.3 9.0.0-preview.24177.1 - 9.0.0-preview.4.24178.9 - 9.0.0-preview.4.24178.9 + 9.0.0-preview.4.24202.9 + 9.0.0-preview.4.24202.9 1.0.517501 From 9c0d04758efd291013c5fbd45a6032f1d9d4c884 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 3 Apr 2024 10:14:15 -0700 Subject: [PATCH 133/568] Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20240402.3 (#6379) Microsoft.CodeAnalysis.NetAnalyzers From Version 9.0.0-preview.24177.1 -> To Version 9.0.0-preview.24202.3 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 28b8a7e42a1..7614679e275 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -18,9 +18,9 @@ - + https://github.com/dotnet/roslyn-analyzers - ad732e236e7ffcb66de4b45a1b736aad4ccdcd83 + 9f40083f29172c903764255c909a0021dd0c8dd6 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 78ef0b333c0..95d5e05037f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -62,7 +62,7 @@ 9.0.100-preview.4.24203.3 - 9.0.0-preview.24177.1 + 9.0.0-preview.24202.3 9.0.0-preview.4.24202.9 9.0.0-preview.4.24202.9 From 1269b7e9952c61e1122a848128883c42ab094ccd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 4 Apr 2024 12:22:22 -0700 Subject: [PATCH 134/568] Update dependencies from https://github.com/dotnet/installer build 20240403.16 (#6380) Microsoft.Dotnet.Sdk.Internal From Version 9.0.100-preview.4.24203.3 -> To Version 9.0.100-preview.4.24203.16 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7614679e275..1c65d937319 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -38,9 +38,9 @@ https://github.com/dotnet/arcade 532f956a119bce77ca279994054d08dbc24418f7 - + https://github.com/dotnet/installer - 2db0e136e92659c88b099672002b0d8015070815 + 85f1744cd65cf7f981530a7b30482ea0248f85df https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 95d5e05037f..337dad6c5cf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -60,7 +60,7 @@ 8.0.0-preview.24202.1 8.0.0-preview.24202.1 - 9.0.100-preview.4.24203.3 + 9.0.100-preview.4.24203.16 9.0.0-preview.24202.3 From f8ca1d4f6275cc280e0e689386f13d124e5bdda3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 4 Apr 2024 12:23:13 -0700 Subject: [PATCH 135/568] Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20240403.1 (#6381) Microsoft.CodeAnalysis.NetAnalyzers From Version 9.0.0-preview.24202.3 -> To Version 9.0.0-preview.24203.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1c65d937319..2091c63ac6c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -18,9 +18,9 @@ - + https://github.com/dotnet/roslyn-analyzers - 9f40083f29172c903764255c909a0021dd0c8dd6 + e4d7ea6a967631713630cb1cf02efa7dfc35a8aa https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 337dad6c5cf..d701ec237c6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -62,7 +62,7 @@ 9.0.100-preview.4.24203.16 - 9.0.0-preview.24202.3 + 9.0.0-preview.24203.1 9.0.0-preview.4.24202.9 9.0.0-preview.4.24202.9 From 25e6604d322cdad6f05a52337adbd9b45d4d0d87 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 5 Apr 2024 15:01:52 +0000 Subject: [PATCH 136/568] Update dependencies from https://github.com/dotnet/diagnostics build 20240404.1 (#6382) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2091c63ac6c..06f234badf7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore 4e75678e761c993ed85b108fab57353eeecf5245 - + https://github.com/dotnet/diagnostics - 99bbd46ec786710ed3b5a1339810ef33b3a508a0 + f6dab4b8b17376a93f26d525b7f1044284eda166 - + https://github.com/dotnet/diagnostics - 99bbd46ec786710ed3b5a1339810ef33b3a508a0 + f6dab4b8b17376a93f26d525b7f1044284eda166 https://github.com/dotnet/command-line-api diff --git a/eng/Versions.props b/eng/Versions.props index d701ec237c6..eeaf5fc35ec 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24201.1 - 8.0.0-preview.24202.1 - 8.0.0-preview.24202.1 + 8.0.0-preview.24204.1 + 8.0.0-preview.24204.1 9.0.100-preview.4.24203.16 From d81c76ce96abbc9bac34726d621d3e77ea90264c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 6 Apr 2024 14:54:38 +0000 Subject: [PATCH 137/568] Update dependencies from https://github.com/dotnet/arcade build 20240405.14 (#6389) [feature/9.x] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 +++++++++---------- eng/Versions.props | 6 +++--- eng/common/cross/build-rootfs.sh | 11 ++++++++-- .../templates-official/job/onelocbuild.yml | 2 +- .../templates-official/job/source-build.yml | 2 +- .../post-build/post-build.yml | 6 +++--- .../variables/pool-providers.yml | 2 +- global.json | 4 ++-- 8 files changed, 30 insertions(+), 23 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 06f234badf7..4bfa300e5ff 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,29 +22,29 @@ https://github.com/dotnet/roslyn-analyzers e4d7ea6a967631713630cb1cf02efa7dfc35a8aa - + https://github.com/dotnet/arcade - 532f956a119bce77ca279994054d08dbc24418f7 + f975f8677ccfd386a91acd3726cd3cbcdc6b57e0 - + https://github.com/dotnet/arcade - 532f956a119bce77ca279994054d08dbc24418f7 + f975f8677ccfd386a91acd3726cd3cbcdc6b57e0 - + https://github.com/dotnet/arcade - 532f956a119bce77ca279994054d08dbc24418f7 + f975f8677ccfd386a91acd3726cd3cbcdc6b57e0 - + https://github.com/dotnet/arcade - 532f956a119bce77ca279994054d08dbc24418f7 + f975f8677ccfd386a91acd3726cd3cbcdc6b57e0 https://github.com/dotnet/installer 85f1744cd65cf7f981530a7b30482ea0248f85df - + https://github.com/dotnet/arcade - 532f956a119bce77ca279994054d08dbc24418f7 + f975f8677ccfd386a91acd3726cd3cbcdc6b57e0 https://github.com/dotnet/symstore diff --git a/eng/Versions.props b/eng/Versions.props index eeaf5fc35ec..7f0e73f2463 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,9 +48,9 @@ --> - 9.0.0-beta.24203.1 - 9.0.0-beta.24203.1 - 9.0.0-beta.24203.1 + 9.0.0-beta.24205.14 + 9.0.0-beta.24205.14 + 9.0.0-beta.24205.14 9.0.0-preview.4.24202.2 9.0.0-preview.4.24202.2 diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index 99a9dd6bb60..a10304fa117 100644 --- a/eng/common/cross/build-rootfs.sh +++ b/eng/common/cross/build-rootfs.sh @@ -444,11 +444,18 @@ __RootfsDir="$( cd "$__RootfsDir" && pwd )" if [[ "$__CodeName" == "alpine" ]]; then __ApkToolsVersion=2.12.11 - __ApkToolsSHA512SUM=53e57b49230da07ef44ee0765b9592580308c407a8d4da7125550957bb72cb59638e04f8892a18b584451c8d841d1c7cb0f0ab680cc323a3015776affaa3be33 __ApkToolsDir="$(mktemp -d)" __ApkKeysDir="$(mktemp -d)" - wget "https://gitlab.alpinelinux.org/api/v4/projects/5/packages/generic//v$__ApkToolsVersion/x86_64/apk.static" -P "$__ApkToolsDir" + arch="$(uname -m)" + wget "https://gitlab.alpinelinux.org/api/v4/projects/5/packages/generic/v$__ApkToolsVersion/$arch/apk.static" -P "$__ApkToolsDir" + if [[ "$arch" == "x86_64" ]]; then + __ApkToolsSHA512SUM="53e57b49230da07ef44ee0765b9592580308c407a8d4da7125550957bb72cb59638e04f8892a18b584451c8d841d1c7cb0f0ab680cc323a3015776affaa3be33" + elif [[ "$arch" == "aarch64" ]]; then + __ApkToolsSHA512SUM="9e2b37ecb2b56c05dad23d379be84fd494c14bd730b620d0d576bda760588e1f2f59a7fcb2f2080577e0085f23a0ca8eadd993b4e61c2ab29549fdb71969afd0" + else + echo "WARNING: add missing hash for your host architecture. To find the value, use: `find /tmp -name apk.static -exec sha512sum {} \;`" + fi echo "$__ApkToolsSHA512SUM $__ApkToolsDir/apk.static" | sha512sum -c chmod +x "$__ApkToolsDir/apk.static" diff --git a/eng/common/templates-official/job/onelocbuild.yml b/eng/common/templates-official/job/onelocbuild.yml index 52b4d05d3f8..ba9ba493032 100644 --- a/eng/common/templates-official/job/onelocbuild.yml +++ b/eng/common/templates-official/job/onelocbuild.yml @@ -56,7 +56,7 @@ jobs: # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: name: $(DncEngInternalBuildPool) - image: 1es-windows-2022 + image: 1es-windows-2022-pt os: windows steps: diff --git a/eng/common/templates-official/job/source-build.yml b/eng/common/templates-official/job/source-build.yml index 50d4b98e201..50f04e642a3 100644 --- a/eng/common/templates-official/job/source-build.yml +++ b/eng/common/templates-official/job/source-build.yml @@ -52,7 +52,7 @@ jobs: ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')] - image: 1es-mariner-2 + image: 1es-mariner-2-pt os: linux ${{ if ne(parameters.platform.pool, '') }}: diff --git a/eng/common/templates-official/post-build/post-build.yml b/eng/common/templates-official/post-build/post-build.yml index da1f40958b4..d286e956bdf 100644 --- a/eng/common/templates-official/post-build/post-build.yml +++ b/eng/common/templates-official/post-build/post-build.yml @@ -110,7 +110,7 @@ stages: # If it's not devdiv, it's dnceng ${{ else }}: name: $(DncEngInternalBuildPool) - image: 1es-windows-2022 + image: 1es-windows-2022-pt os: windows steps: @@ -150,7 +150,7 @@ stages: # If it's not devdiv, it's dnceng ${{ else }}: name: $(DncEngInternalBuildPool) - image: 1es-windows-2022 + image: 1es-windows-2022-pt os: windows steps: - template: setup-maestro-vars.yml @@ -208,7 +208,7 @@ stages: # If it's not devdiv, it's dnceng ${{ else }}: name: $(DncEngInternalBuildPool) - image: 1es-windows-2022 + image: 1es-windows-2022-pt os: windows steps: - template: setup-maestro-vars.yml diff --git a/eng/common/templates-official/variables/pool-providers.yml b/eng/common/templates-official/variables/pool-providers.yml index 1f308b24efc..beab7d1bfba 100644 --- a/eng/common/templates-official/variables/pool-providers.yml +++ b/eng/common/templates-official/variables/pool-providers.yml @@ -23,7 +23,7 @@ # # pool: # name: $(DncEngInternalBuildPool) -# image: 1es-windows-2022 +# image: 1es-windows-2022-pt variables: # Coalesce the target and source branches so we know when a PR targets a release branch diff --git a/global.json b/global.json index 359f03fabef..52f7ce03933 100644 --- a/global.json +++ b/global.json @@ -31,7 +31,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24203.1", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24203.1" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24205.14", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24205.14" } } From 2b69533ad0538a6d1b000d251644270d4536869d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 8 Apr 2024 00:07:11 +0000 Subject: [PATCH 138/568] Restore branch-specific files --- eng/common/templates-official/job/onelocbuild.yml | 2 +- eng/common/templates-official/job/source-build.yml | 2 +- eng/common/templates-official/job/source-index-stage1.yml | 1 - eng/common/templates-official/post-build/post-build.yml | 6 +++--- eng/common/templates-official/variables/pool-providers.yml | 2 +- 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/eng/common/templates-official/job/onelocbuild.yml b/eng/common/templates-official/job/onelocbuild.yml index 52b4d05d3f8..ba9ba493032 100644 --- a/eng/common/templates-official/job/onelocbuild.yml +++ b/eng/common/templates-official/job/onelocbuild.yml @@ -56,7 +56,7 @@ jobs: # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: name: $(DncEngInternalBuildPool) - image: 1es-windows-2022 + image: 1es-windows-2022-pt os: windows steps: diff --git a/eng/common/templates-official/job/source-build.yml b/eng/common/templates-official/job/source-build.yml index 50d4b98e201..50f04e642a3 100644 --- a/eng/common/templates-official/job/source-build.yml +++ b/eng/common/templates-official/job/source-build.yml @@ -52,7 +52,7 @@ jobs: ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')] - image: 1es-mariner-2 + image: 1es-mariner-2-pt os: linux ${{ if ne(parameters.platform.pool, '') }}: diff --git a/eng/common/templates-official/job/source-index-stage1.yml b/eng/common/templates-official/job/source-index-stage1.yml index 60970f9d928..53a9ef51fd8 100644 --- a/eng/common/templates-official/job/source-index-stage1.yml +++ b/eng/common/templates-official/job/source-index-stage1.yml @@ -34,7 +34,6 @@ jobs: ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: $(DncEngInternalBuildPool) image: windows.vs2022.amd64 - os: windows steps: - ${{ each preStep in parameters.preSteps }}: diff --git a/eng/common/templates-official/post-build/post-build.yml b/eng/common/templates-official/post-build/post-build.yml index da1f40958b4..d286e956bdf 100644 --- a/eng/common/templates-official/post-build/post-build.yml +++ b/eng/common/templates-official/post-build/post-build.yml @@ -110,7 +110,7 @@ stages: # If it's not devdiv, it's dnceng ${{ else }}: name: $(DncEngInternalBuildPool) - image: 1es-windows-2022 + image: 1es-windows-2022-pt os: windows steps: @@ -150,7 +150,7 @@ stages: # If it's not devdiv, it's dnceng ${{ else }}: name: $(DncEngInternalBuildPool) - image: 1es-windows-2022 + image: 1es-windows-2022-pt os: windows steps: - template: setup-maestro-vars.yml @@ -208,7 +208,7 @@ stages: # If it's not devdiv, it's dnceng ${{ else }}: name: $(DncEngInternalBuildPool) - image: 1es-windows-2022 + image: 1es-windows-2022-pt os: windows steps: - template: setup-maestro-vars.yml diff --git a/eng/common/templates-official/variables/pool-providers.yml b/eng/common/templates-official/variables/pool-providers.yml index 1f308b24efc..beab7d1bfba 100644 --- a/eng/common/templates-official/variables/pool-providers.yml +++ b/eng/common/templates-official/variables/pool-providers.yml @@ -23,7 +23,7 @@ # # pool: # name: $(DncEngInternalBuildPool) -# image: 1es-windows-2022 +# image: 1es-windows-2022-pt variables: # Coalesce the target and source branches so we know when a PR targets a release branch From 91195340cc119e614e9fa98c686d9bebbf3ec179 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 8 Apr 2024 19:54:42 +0000 Subject: [PATCH 139/568] [feature/9.x] Update dependencies from dotnet/diagnostics (#6391) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4bfa300e5ff..5eb3f169bad 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore 4e75678e761c993ed85b108fab57353eeecf5245 - + https://github.com/dotnet/diagnostics - f6dab4b8b17376a93f26d525b7f1044284eda166 + 8901b6c88e4f875fb69348e846ae233b905d3419 - + https://github.com/dotnet/diagnostics - f6dab4b8b17376a93f26d525b7f1044284eda166 + 8901b6c88e4f875fb69348e846ae233b905d3419 https://github.com/dotnet/command-line-api diff --git a/eng/Versions.props b/eng/Versions.props index 7f0e73f2463..af0912103b5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24201.1 - 8.0.0-preview.24204.1 - 8.0.0-preview.24204.1 + 8.0.0-preview.24205.1 + 8.0.0-preview.24205.1 9.0.100-preview.4.24203.16 From 198c1d0efe363df494d395993d9365e364d215cd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 8 Apr 2024 19:59:21 +0000 Subject: [PATCH 140/568] [feature/9.x] Update dependencies from dotnet/arcade (#6392) [feature/9.x] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- global.json | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5eb3f169bad..1a2669bd103 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,29 +22,29 @@ https://github.com/dotnet/roslyn-analyzers e4d7ea6a967631713630cb1cf02efa7dfc35a8aa - + https://github.com/dotnet/arcade - f975f8677ccfd386a91acd3726cd3cbcdc6b57e0 + 9e3b333509ec2990dd20fbf01f50fd42d7f23d56 - + https://github.com/dotnet/arcade - f975f8677ccfd386a91acd3726cd3cbcdc6b57e0 + 9e3b333509ec2990dd20fbf01f50fd42d7f23d56 - + https://github.com/dotnet/arcade - f975f8677ccfd386a91acd3726cd3cbcdc6b57e0 + 9e3b333509ec2990dd20fbf01f50fd42d7f23d56 - + https://github.com/dotnet/arcade - f975f8677ccfd386a91acd3726cd3cbcdc6b57e0 + 9e3b333509ec2990dd20fbf01f50fd42d7f23d56 https://github.com/dotnet/installer 85f1744cd65cf7f981530a7b30482ea0248f85df - + https://github.com/dotnet/arcade - f975f8677ccfd386a91acd3726cd3cbcdc6b57e0 + 9e3b333509ec2990dd20fbf01f50fd42d7f23d56 https://github.com/dotnet/symstore diff --git a/eng/Versions.props b/eng/Versions.props index af0912103b5..6c978f1df75 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,9 +48,9 @@ --> - 9.0.0-beta.24205.14 - 9.0.0-beta.24205.14 - 9.0.0-beta.24205.14 + 9.0.0-beta.24207.1 + 9.0.0-beta.24207.1 + 9.0.0-beta.24207.1 9.0.0-preview.4.24202.2 9.0.0-preview.4.24202.2 diff --git a/global.json b/global.json index 52f7ce03933..ca66b2c672c 100644 --- a/global.json +++ b/global.json @@ -31,7 +31,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24205.14", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24205.14" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24207.1", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24207.1" } } From 1b548e0c23889a8c31ad5f01215d575250d9316c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 8 Apr 2024 13:02:08 -0700 Subject: [PATCH 141/568] [feature/9.x] Update dependencies from dotnet/installer (#6384) * Update dependencies from https://github.com/dotnet/installer build 20240404.17 Microsoft.Dotnet.Sdk.Internal From Version 9.0.100-preview.4.24203.16 -> To Version 9.0.100-preview.4.24204.17 Dependency coherency updates Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0 From Version 9.0.0-preview.4.24202.2 -> To Version 9.0.0-preview.4.24204.2 (parent: Microsoft.Dotnet.Sdk.Internal * Update dependencies from https://github.com/dotnet/installer build 20240405.18 Microsoft.Dotnet.Sdk.Internal From Version 9.0.100-preview.4.24203.16 -> To Version 9.0.100-preview.4.24205.18 Dependency coherency updates Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0 From Version 9.0.0-preview.4.24202.2 -> To Version 9.0.0-preview.4.24205.2 (parent: Microsoft.Dotnet.Sdk.Internal * Update dependencies from https://github.com/dotnet/installer build 20240407.3 Microsoft.Dotnet.Sdk.Internal From Version 9.0.100-preview.4.24203.16 -> To Version 9.0.100-preview.4.24207.3 Dependency coherency updates Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0 From Version 9.0.0-preview.4.24202.2 -> To Version 9.0.0-preview.4.24205.2 (parent: Microsoft.Dotnet.Sdk.Internal * Update dependencies from https://github.com/dotnet/installer build 20240408.2 Microsoft.Dotnet.Sdk.Internal From Version 9.0.100-preview.4.24203.16 -> To Version 9.0.100-preview.4.24208.2 Dependency coherency updates Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0 From Version 9.0.0-preview.4.24202.2 -> To Version 9.0.0-preview.4.24205.2 (parent: Microsoft.Dotnet.Sdk.Internal --------- Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1a2669bd103..1c856cf5597 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/aspnetcore - 4e75678e761c993ed85b108fab57353eeecf5245 + 76a4e7507352de5cbabfd8d0130b69012442fe3f https://github.com/dotnet/diagnostics @@ -38,9 +38,9 @@ https://github.com/dotnet/arcade 9e3b333509ec2990dd20fbf01f50fd42d7f23d56 - + https://github.com/dotnet/installer - 85f1744cd65cf7f981530a7b30482ea0248f85df + 0bfd2dd757482b30745b799ee0a92cad3d8f5b50 https://github.com/dotnet/arcade @@ -50,17 +50,17 @@ https://github.com/dotnet/symstore 550601c12a227c87ded32316345934101a8a2422 - + https://github.com/dotnet/runtime - 995989e8b33864648080c55e31116d9818b8760c + ffb257818db89672d84d538964cec1b54fb2a094 - + https://github.com/dotnet/aspnetcore - 4e75678e761c993ed85b108fab57353eeecf5245 + 76a4e7507352de5cbabfd8d0130b69012442fe3f - + https://github.com/dotnet/runtime - 995989e8b33864648080c55e31116d9818b8760c + ffb257818db89672d84d538964cec1b54fb2a094 diff --git a/eng/Versions.props b/eng/Versions.props index 6c978f1df75..75c112d0f1d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,20 +52,20 @@ 9.0.0-beta.24207.1 9.0.0-beta.24207.1 - 9.0.0-preview.4.24202.2 - 9.0.0-preview.4.24202.2 + 9.0.0-preview.4.24205.2 + 9.0.0-preview.4.24205.2 2.0.0-beta4.24201.1 8.0.0-preview.24205.1 8.0.0-preview.24205.1 - 9.0.100-preview.4.24203.16 + 9.0.100-preview.4.24208.2 9.0.0-preview.24203.1 - 9.0.0-preview.4.24202.9 - 9.0.0-preview.4.24202.9 + 9.0.0-preview.4.24204.3 + 9.0.0-preview.4.24204.3 1.0.517501 From cc81c57ba6deec4da5d73db00cc4f971f794e857 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 9 Apr 2024 14:37:54 +0000 Subject: [PATCH 142/568] Update dependencies from https://github.com/dotnet/arcade build 20240408.8 (#6403) [feature/9.x] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 +++++----- eng/Versions.props | 6 +-- eng/common/cross/build-rootfs.sh | 64 +++++++++++++++++++------------- global.json | 4 +- 4 files changed, 54 insertions(+), 40 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1c856cf5597..47d69053582 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,29 +22,29 @@ https://github.com/dotnet/roslyn-analyzers e4d7ea6a967631713630cb1cf02efa7dfc35a8aa - + https://github.com/dotnet/arcade - 9e3b333509ec2990dd20fbf01f50fd42d7f23d56 + a4f367bfa9602e4c24f509902285176fa3153a64 - + https://github.com/dotnet/arcade - 9e3b333509ec2990dd20fbf01f50fd42d7f23d56 + a4f367bfa9602e4c24f509902285176fa3153a64 - + https://github.com/dotnet/arcade - 9e3b333509ec2990dd20fbf01f50fd42d7f23d56 + a4f367bfa9602e4c24f509902285176fa3153a64 - + https://github.com/dotnet/arcade - 9e3b333509ec2990dd20fbf01f50fd42d7f23d56 + a4f367bfa9602e4c24f509902285176fa3153a64 https://github.com/dotnet/installer 0bfd2dd757482b30745b799ee0a92cad3d8f5b50 - + https://github.com/dotnet/arcade - 9e3b333509ec2990dd20fbf01f50fd42d7f23d56 + a4f367bfa9602e4c24f509902285176fa3153a64 https://github.com/dotnet/symstore diff --git a/eng/Versions.props b/eng/Versions.props index 75c112d0f1d..ff97cf87fc0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,9 +48,9 @@ --> - 9.0.0-beta.24207.1 - 9.0.0-beta.24207.1 - 9.0.0-beta.24207.1 + 9.0.0-beta.24208.8 + 9.0.0-beta.24208.8 + 9.0.0-beta.24208.8 9.0.0-preview.4.24205.2 9.0.0-preview.4.24205.2 diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index a10304fa117..ed1bfeda3c9 100644 --- a/eng/common/cross/build-rootfs.sh +++ b/eng/common/cross/build-rootfs.sh @@ -142,7 +142,6 @@ while :; do case $lowerI in -\?|-h|--help) usage - exit 1 ;; arm) __BuildArch=arm @@ -229,12 +228,19 @@ while :; do __UbuntuRepo="http://archive.ubuntu.com/ubuntu/" ;; lldb*) - version="${lowerI/lldb/}" - parts=(${version//./ }) + version="$(echo "$lowerI" | tr -d '[:alpha:]-=')" + majorVersion="${version%%.*}" + + [ -z "${version##*.*}" ] && minorVersion="${version#*.}" + if [ -z "$minorVersion" ]; then + minorVersion=0 + fi # for versions > 6.0, lldb has dropped the minor version - if [[ "${parts[0]}" -gt 6 ]]; then - version="${parts[0]}" + if [ "$majorVersion" -le 6 ]; then + version="$majorVersion.$minorVersion" + else + version="$majorVersion" fi __LLDB_Package="liblldb-${version}-dev" @@ -243,15 +249,19 @@ while :; do unset __LLDB_Package ;; llvm*) - version="${lowerI/llvm/}" - parts=(${version//./ }) - __LLVM_MajorVersion="${parts[0]}" - __LLVM_MinorVersion="${parts[1]}" - - # for versions > 6.0, llvm has dropped the minor version - if [[ -z "$__LLVM_MinorVersion" && "$__LLVM_MajorVersion" -le 6 ]]; then - __LLVM_MinorVersion=0; + version="$(echo "$lowerI" | tr -d '[:alpha:]-=')" + __LLVM_MajorVersion="${version%%.*}" + + [ -z "${version##*.*}" ] && __LLVM_MinorVersion="${version#*.}" + if [ -z "$__LLVM_MinorVersion" ]; then + __LLVM_MinorVersion=0 fi + + # for versions > 6.0, lldb has dropped the minor version + if [ "$__LLVM_MajorVersion" -gt 6 ]; then + __LLVM_MinorVersion= + fi + ;; xenial) # Ubuntu 16.04 if [[ "$__CodeName" != "jessie" ]]; then @@ -323,15 +333,14 @@ while :; do alpine*) __CodeName=alpine __UbuntuRepo= - version="${lowerI/alpine/}" - if [[ "$version" == "edge" ]]; then + if [[ "$lowerI" == "alpineedge" ]]; then __AlpineVersion=edge else - parts=(${version//./ }) - __AlpineMajorVersion="${parts[0]}" - __AlpineMinoVersion="${parts[1]}" - __AlpineVersion="$__AlpineMajorVersion.$__AlpineMinoVersion" + version="$(echo "$lowerI" | tr -d '[:alpha:]-=')" + __AlpineMajorVersion="${version%%.*}" + __AlpineMinorVersion="${version#*.}" + __AlpineVersion="$__AlpineMajorVersion.$__AlpineMinorVersion" fi ;; freebsd13) @@ -454,7 +463,7 @@ if [[ "$__CodeName" == "alpine" ]]; then elif [[ "$arch" == "aarch64" ]]; then __ApkToolsSHA512SUM="9e2b37ecb2b56c05dad23d379be84fd494c14bd730b620d0d576bda760588e1f2f59a7fcb2f2080577e0085f23a0ca8eadd993b4e61c2ab29549fdb71969afd0" else - echo "WARNING: add missing hash for your host architecture. To find the value, use: `find /tmp -name apk.static -exec sha512sum {} \;`" + echo "WARNING: add missing hash for your host architecture. To find the value, use: 'find /tmp -name apk.static -exec sha512sum {} \;'" fi echo "$__ApkToolsSHA512SUM $__ApkToolsDir/apk.static" | sha512sum -c chmod +x "$__ApkToolsDir/apk.static" @@ -484,12 +493,14 @@ if [[ "$__CodeName" == "alpine" ]]; then fi # initialize DB + # shellcheck disable=SC2086 "$__ApkToolsDir/apk.static" \ -X "http://dl-cdn.alpinelinux.org/alpine/$version/main" \ -X "http://dl-cdn.alpinelinux.org/alpine/$version/community" \ -U $__ApkSignatureArg --root "$__RootfsDir" --arch "$__AlpineArch" --initdb add if [[ "$__AlpineLlvmLibsLookup" == 1 ]]; then + # shellcheck disable=SC2086 __AlpinePackages+=" $("$__ApkToolsDir/apk.static" \ -X "http://dl-cdn.alpinelinux.org/alpine/$version/main" \ -X "http://dl-cdn.alpinelinux.org/alpine/$version/community" \ @@ -498,6 +509,7 @@ if [[ "$__CodeName" == "alpine" ]]; then fi # install all packages in one go + # shellcheck disable=SC2086 "$__ApkToolsDir/apk.static" \ -X "http://dl-cdn.alpinelinux.org/alpine/$version/main" \ -X "http://dl-cdn.alpinelinux.org/alpine/$version/community" \ @@ -521,6 +533,7 @@ elif [[ "$__CodeName" == "freebsd" ]]; then rm -rf "$__RootfsDir/tmp/pkg-${__FreeBSDPkg}" # install packages we need. INSTALL_AS_USER=$(whoami) "$__RootfsDir"/host/sbin/pkg -r "$__RootfsDir" -C "$__RootfsDir"/usr/local/etc/pkg.conf update + # shellcheck disable=SC2086 INSTALL_AS_USER=$(whoami) "$__RootfsDir"/host/sbin/pkg -r "$__RootfsDir" -C "$__RootfsDir"/usr/local/etc/pkg.conf install --yes $__FreeBSDPackages elif [[ "$__CodeName" == "illumos" ]]; then mkdir "$__RootfsDir/tmp" @@ -582,8 +595,8 @@ elif [[ "$__CodeName" == "haiku" ]]; then mkdir "$__RootfsDir/tmp/download" echo "Downloading Haiku package tool" - git clone https://github.com/haiku/haiku-toolchains-ubuntu --depth 1 $__RootfsDir/tmp/script - wget -O "$__RootfsDir/tmp/download/hosttools.zip" $($__RootfsDir/tmp/script/fetch.sh --hosttools) + git clone https://github.com/haiku/haiku-toolchains-ubuntu --depth 1 "$__RootfsDir/tmp/script" + wget -O "$__RootfsDir/tmp/download/hosttools.zip" "$("$__RootfsDir/tmp/script/fetch.sh" --hosttools)" unzip -o "$__RootfsDir/tmp/download/hosttools.zip" -d "$__RootfsDir/tmp/bin" DepotBaseUrl="https://depot.haiku-os.org/__api/v2/pkg/get-pkg" @@ -616,7 +629,7 @@ elif [[ "$__CodeName" == "haiku" ]]; then # Download buildtools echo "Downloading Haiku buildtools" - wget -O "$__RootfsDir/tmp/download/buildtools.zip" $($__RootfsDir/tmp/script/fetch.sh --buildtools --arch=$__HaikuArch) + wget -O "$__RootfsDir/tmp/download/buildtools.zip" "$("$__RootfsDir/tmp/script/fetch.sh" --buildtools --arch=$__HaikuArch)" unzip -o "$__RootfsDir/tmp/download/buildtools.zip" -d "$__RootfsDir" # Cleaning up temporary files @@ -629,10 +642,12 @@ elif [[ -n "$__CodeName" ]]; then __Keyring="$__Keyring --force-check-gpg" fi + # shellcheck disable=SC2086 debootstrap "--variant=minbase" $__Keyring --arch "$__UbuntuArch" "$__CodeName" "$__RootfsDir" "$__UbuntuRepo" cp "$__CrossDir/$__BuildArch/sources.list.$__CodeName" "$__RootfsDir/etc/apt/sources.list" chroot "$__RootfsDir" apt-get update chroot "$__RootfsDir" apt-get -f -y install + # shellcheck disable=SC2086 chroot "$__RootfsDir" apt-get -y install $__UbuntuPackages chroot "$__RootfsDir" symlinks -cr /usr chroot "$__RootfsDir" apt-get clean @@ -650,6 +665,5 @@ elif [[ "$__Tizen" == "tizen" ]]; then ROOTFS_DIR="$__RootfsDir" "$__CrossDir/tizen-build-rootfs.sh" "$__BuildArch" else echo "Unsupported target platform." - usage; - exit 1 + usage fi diff --git a/global.json b/global.json index ca66b2c672c..7881bb89cdf 100644 --- a/global.json +++ b/global.json @@ -31,7 +31,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24207.1", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24207.1" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24208.8", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24208.8" } } From 29ae3ce97330e281616028befb615050326696aa Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 10 Apr 2024 14:33:12 +0000 Subject: [PATCH 143/568] Update dependencies from https://github.com/dotnet/diagnostics build 20240409.1 (#6410) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 47d69053582..9cbff24b9dd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore 76a4e7507352de5cbabfd8d0130b69012442fe3f - + https://github.com/dotnet/diagnostics - 8901b6c88e4f875fb69348e846ae233b905d3419 + 07b8e02b23c21bfa291a0f0f96a2a227399cd736 - + https://github.com/dotnet/diagnostics - 8901b6c88e4f875fb69348e846ae233b905d3419 + 07b8e02b23c21bfa291a0f0f96a2a227399cd736 https://github.com/dotnet/command-line-api diff --git a/eng/Versions.props b/eng/Versions.props index ff97cf87fc0..e8ab1fdbd6e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24201.1 - 8.0.0-preview.24205.1 - 8.0.0-preview.24205.1 + 8.0.0-preview.24209.1 + 8.0.0-preview.24209.1 9.0.100-preview.4.24208.2 From fb5a77117d1801ab67d3629e0e229db62fdd1bb5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 10 Apr 2024 14:37:50 +0000 Subject: [PATCH 144/568] Update dependencies from https://github.com/dotnet/arcade build 20240409.3 (#6412) [feature/9.x] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- global.json | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9cbff24b9dd..c95f8404a02 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,29 +22,29 @@ https://github.com/dotnet/roslyn-analyzers e4d7ea6a967631713630cb1cf02efa7dfc35a8aa - + https://github.com/dotnet/arcade - a4f367bfa9602e4c24f509902285176fa3153a64 + 1fd3bf852108d4a3e0e4b71c405e446469b08ea6 - + https://github.com/dotnet/arcade - a4f367bfa9602e4c24f509902285176fa3153a64 + 1fd3bf852108d4a3e0e4b71c405e446469b08ea6 - + https://github.com/dotnet/arcade - a4f367bfa9602e4c24f509902285176fa3153a64 + 1fd3bf852108d4a3e0e4b71c405e446469b08ea6 - + https://github.com/dotnet/arcade - a4f367bfa9602e4c24f509902285176fa3153a64 + 1fd3bf852108d4a3e0e4b71c405e446469b08ea6 https://github.com/dotnet/installer 0bfd2dd757482b30745b799ee0a92cad3d8f5b50 - + https://github.com/dotnet/arcade - a4f367bfa9602e4c24f509902285176fa3153a64 + 1fd3bf852108d4a3e0e4b71c405e446469b08ea6 https://github.com/dotnet/symstore diff --git a/eng/Versions.props b/eng/Versions.props index e8ab1fdbd6e..b3a18271b89 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,9 +48,9 @@ --> - 9.0.0-beta.24208.8 - 9.0.0-beta.24208.8 - 9.0.0-beta.24208.8 + 9.0.0-beta.24209.3 + 9.0.0-beta.24209.3 + 9.0.0-beta.24209.3 9.0.0-preview.4.24205.2 9.0.0-preview.4.24205.2 diff --git a/global.json b/global.json index 7881bb89cdf..dcfdfddad28 100644 --- a/global.json +++ b/global.json @@ -31,7 +31,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24208.8", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24208.8" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24209.3", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24209.3" } } From 539d45c5d0745617b6d0192dba9afebba92da5bd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 10 Apr 2024 14:43:54 +0000 Subject: [PATCH 145/568] Update dependencies from https://github.com/dotnet/command-line-api build 20240409.3 (#6411) [feature/9.x] Update dependencies from dotnet/command-line-api --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c95f8404a02..7ddd4ccc415 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -12,9 +12,9 @@ https://github.com/dotnet/diagnostics 07b8e02b23c21bfa291a0f0f96a2a227399cd736 - + https://github.com/dotnet/command-line-api - c96672b8b84c307feb035fed6cbe9db85d5b87d3 + 963d34b1fb712c673bfb198133d7e988182c9ef4 diff --git a/eng/Versions.props b/eng/Versions.props index b3a18271b89..a25553ef42a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,7 +55,7 @@ 9.0.0-preview.4.24205.2 9.0.0-preview.4.24205.2 - 2.0.0-beta4.24201.1 + 2.0.0-beta4.24209.3 8.0.0-preview.24209.1 8.0.0-preview.24209.1 From 930efa31cb546e408e0ffb96d9e7a73de1935a20 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 11 Apr 2024 14:36:43 +0000 Subject: [PATCH 146/568] Update dependencies from https://github.com/dotnet/diagnostics build 20240410.2 (#6432) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7ddd4ccc415..8f9956d1796 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore 76a4e7507352de5cbabfd8d0130b69012442fe3f - + https://github.com/dotnet/diagnostics - 07b8e02b23c21bfa291a0f0f96a2a227399cd736 + 98d370aab2764346080020ad9a323b49ecc07d91 - + https://github.com/dotnet/diagnostics - 07b8e02b23c21bfa291a0f0f96a2a227399cd736 + 98d370aab2764346080020ad9a323b49ecc07d91 https://github.com/dotnet/command-line-api diff --git a/eng/Versions.props b/eng/Versions.props index a25553ef42a..0f794b6a3d8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24209.3 - 8.0.0-preview.24209.1 - 8.0.0-preview.24209.1 + 8.0.0-preview.24210.2 + 8.0.0-preview.24210.2 9.0.100-preview.4.24208.2 From a2cf703dae3ad8e925bb950525fd30bca71935f2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 11 Apr 2024 14:47:13 +0000 Subject: [PATCH 147/568] Update dependencies from https://github.com/dotnet/arcade build 20240410.4 (#6433) [feature/9.x] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 +++++++++---------- eng/Versions.props | 6 +++--- .../templates-official/job/source-build.yml | 2 +- .../templates-official/jobs/source-build.yml | 2 +- eng/common/templates/job/source-build.yml | 4 ++-- eng/common/templates/jobs/source-build.yml | 2 +- global.json | 4 ++-- 7 files changed, 20 insertions(+), 20 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8f9956d1796..140f06829ce 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,29 +22,29 @@ https://github.com/dotnet/roslyn-analyzers e4d7ea6a967631713630cb1cf02efa7dfc35a8aa - + https://github.com/dotnet/arcade - 1fd3bf852108d4a3e0e4b71c405e446469b08ea6 + a26575045adf694ecd7af6b1a310d2324ef5682b - + https://github.com/dotnet/arcade - 1fd3bf852108d4a3e0e4b71c405e446469b08ea6 + a26575045adf694ecd7af6b1a310d2324ef5682b - + https://github.com/dotnet/arcade - 1fd3bf852108d4a3e0e4b71c405e446469b08ea6 + a26575045adf694ecd7af6b1a310d2324ef5682b - + https://github.com/dotnet/arcade - 1fd3bf852108d4a3e0e4b71c405e446469b08ea6 + a26575045adf694ecd7af6b1a310d2324ef5682b https://github.com/dotnet/installer 0bfd2dd757482b30745b799ee0a92cad3d8f5b50 - + https://github.com/dotnet/arcade - 1fd3bf852108d4a3e0e4b71c405e446469b08ea6 + a26575045adf694ecd7af6b1a310d2324ef5682b https://github.com/dotnet/symstore diff --git a/eng/Versions.props b/eng/Versions.props index 0f794b6a3d8..f7899ff9010 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,9 +48,9 @@ --> - 9.0.0-beta.24209.3 - 9.0.0-beta.24209.3 - 9.0.0-beta.24209.3 + 9.0.0-beta.24210.4 + 9.0.0-beta.24210.4 + 9.0.0-beta.24210.4 9.0.0-preview.4.24205.2 9.0.0-preview.4.24205.2 diff --git a/eng/common/templates-official/job/source-build.yml b/eng/common/templates-official/job/source-build.yml index 50f04e642a3..c918720931f 100644 --- a/eng/common/templates-official/job/source-build.yml +++ b/eng/common/templates-official/job/source-build.yml @@ -48,7 +48,7 @@ jobs: pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore-Svc-Public' ), False, 'NetCore-Public')] - demands: ImageOverride -equals build.ubuntu.1804.amd64 + demands: ImageOverride -equals build.ubuntu.2004.amd64 ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')] diff --git a/eng/common/templates-official/jobs/source-build.yml b/eng/common/templates-official/jobs/source-build.yml index 08e5db9bb11..2076f4e25b4 100644 --- a/eng/common/templates-official/jobs/source-build.yml +++ b/eng/common/templates-official/jobs/source-build.yml @@ -14,7 +14,7 @@ parameters: # This is the default platform provided by Arcade, intended for use by a managed-only repo. defaultManagedPlatform: name: 'Managed' - container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8' + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9' # Defines the platforms on which to run build jobs. One job is created for each platform, and the # object in this array is sent to the job template as 'platform'. If no platforms are specified, diff --git a/eng/common/templates/job/source-build.yml b/eng/common/templates/job/source-build.yml index 8a3deef2b72..d7ed209494c 100644 --- a/eng/common/templates/job/source-build.yml +++ b/eng/common/templates/job/source-build.yml @@ -48,11 +48,11 @@ jobs: pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore-Svc-Public' ), False, 'NetCore-Public')] - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open + demands: ImageOverride -equals Build.Ubuntu.2204.Amd64.Open ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')] - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + demands: ImageOverride -equals Build.Ubuntu.2204.Amd64 ${{ if ne(parameters.platform.pool, '') }}: pool: ${{ parameters.platform.pool }} diff --git a/eng/common/templates/jobs/source-build.yml b/eng/common/templates/jobs/source-build.yml index a15b07eb51d..da91481ff1d 100644 --- a/eng/common/templates/jobs/source-build.yml +++ b/eng/common/templates/jobs/source-build.yml @@ -14,7 +14,7 @@ parameters: # This is the default platform provided by Arcade, intended for use by a managed-only repo. defaultManagedPlatform: name: 'Managed' - container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8' + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9' # Defines the platforms on which to run build jobs. One job is created for each platform, and the # object in this array is sent to the job template as 'platform'. If no platforms are specified, diff --git a/global.json b/global.json index dcfdfddad28..a785b4e81a6 100644 --- a/global.json +++ b/global.json @@ -31,7 +31,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24209.3", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24209.3" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24210.4", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24210.4" } } From fd7eee4e64c6daad222986553a6a6e34d13d33a8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 11 Apr 2024 09:39:48 -0700 Subject: [PATCH 148/568] [feature/9.x] Update dependencies from dotnet/roslyn-analyzers (#6405) * Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20240408.3 Microsoft.CodeAnalysis.NetAnalyzers From Version 9.0.0-preview.24203.1 -> To Version 9.0.0-preview.24208.3 * Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20240408.3 Microsoft.CodeAnalysis.NetAnalyzers From Version 9.0.0-preview.24203.1 -> To Version 9.0.0-preview.24208.3 * Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20240408.3 Microsoft.CodeAnalysis.NetAnalyzers From Version 9.0.0-preview.24203.1 -> To Version 9.0.0-preview.24208.3 --------- Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 140f06829ce..e3a1fb86d13 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -18,9 +18,9 @@ - + https://github.com/dotnet/roslyn-analyzers - e4d7ea6a967631713630cb1cf02efa7dfc35a8aa + 7455f63411369a962f769361d1a979a547756ada https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index f7899ff9010..7098d161b34 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -62,7 +62,7 @@ 9.0.100-preview.4.24208.2 - 9.0.0-preview.24203.1 + 9.0.0-preview.24208.3 9.0.0-preview.4.24204.3 9.0.0-preview.4.24204.3 From c7aa9f49a28e86d97964217bfbf5720d98bfe0dc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 11 Apr 2024 09:40:03 -0700 Subject: [PATCH 149/568] [feature/9.x] Update dependencies from dotnet/installer (#6404) * Update dependencies from https://github.com/dotnet/installer build 20240409.5 Microsoft.Dotnet.Sdk.Internal From Version 9.0.100-preview.4.24208.2 -> To Version 9.0.100-preview.4.24209.5 * Update dependencies from https://github.com/dotnet/installer build 20240409.32 Microsoft.Dotnet.Sdk.Internal From Version 9.0.100-preview.4.24208.2 -> To Version 9.0.100-preview.4.24209.32 Dependency coherency updates Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0 From Version 9.0.0-preview.4.24205.2 -> To Version 9.0.0-preview.4.24208.6 (parent: Microsoft.Dotnet.Sdk.Internal * Update dependencies from https://github.com/dotnet/installer build 20240410.38 Microsoft.Dotnet.Sdk.Internal From Version 9.0.100-preview.4.24208.2 -> To Version 9.0.100-preview.4.24210.38 Dependency coherency updates Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0 From Version 9.0.0-preview.4.24205.2 -> To Version 9.0.0-preview.4.24208.6 (parent: Microsoft.Dotnet.Sdk.Internal --------- Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e3a1fb86d13..44b37b9d545 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/aspnetcore - 76a4e7507352de5cbabfd8d0130b69012442fe3f + 79ef5e329b1e31c3775a1977798253cc8f7da6cc https://github.com/dotnet/diagnostics @@ -38,9 +38,9 @@ https://github.com/dotnet/arcade a26575045adf694ecd7af6b1a310d2324ef5682b - + https://github.com/dotnet/installer - 0bfd2dd757482b30745b799ee0a92cad3d8f5b50 + 8f9999e8850cfa64f99826656f15a76d6171b30b https://github.com/dotnet/arcade @@ -50,17 +50,17 @@ https://github.com/dotnet/symstore 550601c12a227c87ded32316345934101a8a2422 - + https://github.com/dotnet/runtime - ffb257818db89672d84d538964cec1b54fb2a094 + 6b9381be09980dac0d2fc554cf478e054c005cdb - + https://github.com/dotnet/aspnetcore - 76a4e7507352de5cbabfd8d0130b69012442fe3f + 79ef5e329b1e31c3775a1977798253cc8f7da6cc - + https://github.com/dotnet/runtime - ffb257818db89672d84d538964cec1b54fb2a094 + 6b9381be09980dac0d2fc554cf478e054c005cdb diff --git a/eng/Versions.props b/eng/Versions.props index 7098d161b34..1fbd72b9c0e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,20 +52,20 @@ 9.0.0-beta.24210.4 9.0.0-beta.24210.4 - 9.0.0-preview.4.24205.2 - 9.0.0-preview.4.24205.2 + 9.0.0-preview.4.24208.6 + 9.0.0-preview.4.24208.6 2.0.0-beta4.24209.3 8.0.0-preview.24210.2 8.0.0-preview.24210.2 - 9.0.100-preview.4.24208.2 + 9.0.100-preview.4.24210.38 9.0.0-preview.24208.3 - 9.0.0-preview.4.24204.3 - 9.0.0-preview.4.24204.3 + 9.0.0-preview.4.24209.8 + 9.0.0-preview.4.24209.8 1.0.517501 From 8557420caffff8a5ec587aa251725dd792776d65 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 12 Apr 2024 11:48:06 -0700 Subject: [PATCH 150/568] Update dependencies from https://github.com/dotnet/installer build 20240411.4 (#6438) Microsoft.Dotnet.Sdk.Internal From Version 9.0.100-preview.4.24210.38 -> To Version 9.0.100-preview.4.24211.4 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 44b37b9d545..477de537be7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -38,9 +38,9 @@ https://github.com/dotnet/arcade a26575045adf694ecd7af6b1a310d2324ef5682b - + https://github.com/dotnet/installer - 8f9999e8850cfa64f99826656f15a76d6171b30b + c61f05c5628fdba80433184eb00353a908dbdccc https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 1fbd72b9c0e..70df37ae5fa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -60,7 +60,7 @@ 8.0.0-preview.24210.2 8.0.0-preview.24210.2 - 9.0.100-preview.4.24210.38 + 9.0.100-preview.4.24211.4 9.0.0-preview.24208.3 From bb2064b67e43293bb9eb353d5393113b9933d405 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 13 Apr 2024 14:47:53 +0000 Subject: [PATCH 151/568] Update dependencies from https://github.com/dotnet/diagnostics build 20240412.2 (#6446) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 477de537be7..5ca6237970d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore 79ef5e329b1e31c3775a1977798253cc8f7da6cc - + https://github.com/dotnet/diagnostics - 98d370aab2764346080020ad9a323b49ecc07d91 + 1f6a0ea3f4d8ced5dc5d640672d3c9b8f373d6fc - + https://github.com/dotnet/diagnostics - 98d370aab2764346080020ad9a323b49ecc07d91 + 1f6a0ea3f4d8ced5dc5d640672d3c9b8f373d6fc https://github.com/dotnet/command-line-api diff --git a/eng/Versions.props b/eng/Versions.props index 70df37ae5fa..6153374115c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24209.3 - 8.0.0-preview.24210.2 - 8.0.0-preview.24210.2 + 8.0.0-preview.24212.2 + 8.0.0-preview.24212.2 9.0.100-preview.4.24211.4 From ab7d0e05a3a502628bac6b1bff51443b9171aa9d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 13 Apr 2024 14:52:18 +0000 Subject: [PATCH 152/568] Update dependencies from https://github.com/dotnet/arcade build 20240412.4 (#6447) [feature/9.x] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- global.json | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5ca6237970d..d2dddeeee12 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,29 +22,29 @@ https://github.com/dotnet/roslyn-analyzers 7455f63411369a962f769361d1a979a547756ada - + https://github.com/dotnet/arcade - a26575045adf694ecd7af6b1a310d2324ef5682b + 87b015b938e5400d6e57afd7650348c17a764b73 - + https://github.com/dotnet/arcade - a26575045adf694ecd7af6b1a310d2324ef5682b + 87b015b938e5400d6e57afd7650348c17a764b73 - + https://github.com/dotnet/arcade - a26575045adf694ecd7af6b1a310d2324ef5682b + 87b015b938e5400d6e57afd7650348c17a764b73 - + https://github.com/dotnet/arcade - a26575045adf694ecd7af6b1a310d2324ef5682b + 87b015b938e5400d6e57afd7650348c17a764b73 https://github.com/dotnet/installer c61f05c5628fdba80433184eb00353a908dbdccc - + https://github.com/dotnet/arcade - a26575045adf694ecd7af6b1a310d2324ef5682b + 87b015b938e5400d6e57afd7650348c17a764b73 https://github.com/dotnet/symstore diff --git a/eng/Versions.props b/eng/Versions.props index 6153374115c..53bd4f8b085 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,9 +48,9 @@ --> - 9.0.0-beta.24210.4 - 9.0.0-beta.24210.4 - 9.0.0-beta.24210.4 + 9.0.0-beta.24212.4 + 9.0.0-beta.24212.4 + 9.0.0-beta.24212.4 9.0.0-preview.4.24208.6 9.0.0-preview.4.24208.6 diff --git a/global.json b/global.json index a785b4e81a6..bd0ae85c94e 100644 --- a/global.json +++ b/global.json @@ -31,7 +31,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24210.4", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24210.4" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24212.4", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24212.4" } } From 2215a233271bef0647ed8d3cf754281b6c24f7a1 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 15 Apr 2024 02:18:16 +0000 Subject: [PATCH 153/568] Restore branch-specific files --- eng/common/templates-official/steps/component-governance.yml | 2 +- eng/common/templates/steps/component-governance.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/common/templates-official/steps/component-governance.yml b/eng/common/templates-official/steps/component-governance.yml index cbba0596709..0ecec47b0c9 100644 --- a/eng/common/templates-official/steps/component-governance.yml +++ b/eng/common/templates-official/steps/component-governance.yml @@ -4,7 +4,7 @@ parameters: steps: - ${{ if eq(parameters.disableComponentGovernance, 'true') }}: - - script: echo "##vso[task.setvariable variable=skipComponentGovernanceDetection]true" + - script: "echo ##vso[task.setvariable variable=skipComponentGovernanceDetection]true" displayName: Set skipComponentGovernanceDetection variable - ${{ if ne(parameters.disableComponentGovernance, 'true') }}: - task: ComponentGovernanceComponentDetection@0 diff --git a/eng/common/templates/steps/component-governance.yml b/eng/common/templates/steps/component-governance.yml index cbba0596709..0ecec47b0c9 100644 --- a/eng/common/templates/steps/component-governance.yml +++ b/eng/common/templates/steps/component-governance.yml @@ -4,7 +4,7 @@ parameters: steps: - ${{ if eq(parameters.disableComponentGovernance, 'true') }}: - - script: echo "##vso[task.setvariable variable=skipComponentGovernanceDetection]true" + - script: "echo ##vso[task.setvariable variable=skipComponentGovernanceDetection]true" displayName: Set skipComponentGovernanceDetection variable - ${{ if ne(parameters.disableComponentGovernance, 'true') }}: - task: ComponentGovernanceComponentDetection@0 From 3c26518824cdc935d434e62b9d6c657a62b17d80 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 15 Apr 2024 16:31:02 -0700 Subject: [PATCH 154/568] [feature/9.x] Update dependencies from dotnet/roslyn-analyzers (#6450) * Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20240412.1 Microsoft.CodeAnalysis.NetAnalyzers From Version 9.0.0-preview.24208.3 -> To Version 9.0.0-preview.24212.1 * Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20240412.1 Microsoft.CodeAnalysis.NetAnalyzers From Version 9.0.0-preview.24208.3 -> To Version 9.0.0-preview.24212.1 * Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20240412.1 Microsoft.CodeAnalysis.NetAnalyzers From Version 9.0.0-preview.24208.3 -> To Version 9.0.0-preview.24212.1 --------- Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d2dddeeee12..116116a0ac8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -18,9 +18,9 @@ - + https://github.com/dotnet/roslyn-analyzers - 7455f63411369a962f769361d1a979a547756ada + 4d72fc19879fbc78a12d3a84ed60e7d17777d8b7 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 53bd4f8b085..ab466181917 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -62,7 +62,7 @@ 9.0.100-preview.4.24211.4 - 9.0.0-preview.24208.3 + 9.0.0-preview.24212.1 9.0.0-preview.4.24209.8 9.0.0-preview.4.24209.8 From d3f4548a7023752c942ebaf96904b162f77771e2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 15 Apr 2024 16:31:13 -0700 Subject: [PATCH 155/568] [feature/9.x] Update dependencies from dotnet/installer (#6449) * Update dependencies from https://github.com/dotnet/installer build 20240412.40 Microsoft.Dotnet.Sdk.Internal From Version 9.0.100-preview.4.24211.4 -> To Version 9.0.100-preview.4.24212.40 * Update dependencies from https://github.com/dotnet/installer build 20240413.2 Microsoft.Dotnet.Sdk.Internal From Version 9.0.100-preview.4.24211.4 -> To Version 9.0.100-preview.4.24213.2 Dependency coherency updates Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0 From Version 9.0.0-preview.4.24208.6 -> To Version 9.0.0-preview.4.24212.2 (parent: Microsoft.Dotnet.Sdk.Internal * Update dependencies from https://github.com/dotnet/installer build 20240415.2 Microsoft.Dotnet.Sdk.Internal From Version 9.0.100-preview.4.24211.4 -> To Version 9.0.100-preview.4.24215.2 Dependency coherency updates Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0 From Version 9.0.0-preview.4.24208.6 -> To Version 9.0.0-preview.4.24213.1 (parent: Microsoft.Dotnet.Sdk.Internal --------- Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 116116a0ac8..42a0b885de1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/aspnetcore - 79ef5e329b1e31c3775a1977798253cc8f7da6cc + 81355450754f0e6471244b7f1f457b866e982a15 https://github.com/dotnet/diagnostics @@ -38,9 +38,9 @@ https://github.com/dotnet/arcade 87b015b938e5400d6e57afd7650348c17a764b73 - + https://github.com/dotnet/installer - c61f05c5628fdba80433184eb00353a908dbdccc + 7380c301c1ce7d022dd365dd78c4004a2881edaf https://github.com/dotnet/arcade @@ -50,17 +50,17 @@ https://github.com/dotnet/symstore 550601c12a227c87ded32316345934101a8a2422 - + https://github.com/dotnet/runtime - 6b9381be09980dac0d2fc554cf478e054c005cdb + 93010da2628bcd16aaea0288d52a7af8d4542037 - + https://github.com/dotnet/aspnetcore - 79ef5e329b1e31c3775a1977798253cc8f7da6cc + 81355450754f0e6471244b7f1f457b866e982a15 - + https://github.com/dotnet/runtime - 6b9381be09980dac0d2fc554cf478e054c005cdb + 93010da2628bcd16aaea0288d52a7af8d4542037 diff --git a/eng/Versions.props b/eng/Versions.props index ab466181917..3bda0115027 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,20 +52,20 @@ 9.0.0-beta.24212.4 9.0.0-beta.24212.4 - 9.0.0-preview.4.24208.6 - 9.0.0-preview.4.24208.6 + 9.0.0-preview.4.24213.1 + 9.0.0-preview.4.24213.1 2.0.0-beta4.24209.3 8.0.0-preview.24212.2 8.0.0-preview.24212.2 - 9.0.100-preview.4.24211.4 + 9.0.100-preview.4.24215.2 9.0.0-preview.24212.1 - 9.0.0-preview.4.24209.8 - 9.0.0-preview.4.24209.8 + 9.0.0-preview.4.24211.4 + 9.0.0-preview.4.24211.4 1.0.517501 From 5889e8fb7dceeb827d347a954cf5ff6eb0083ceb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 16 Apr 2024 14:49:01 +0000 Subject: [PATCH 156/568] Update dependencies from https://github.com/dotnet/diagnostics build 20240415.1 (#6461) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 42a0b885de1..20fa9fea763 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore 81355450754f0e6471244b7f1f457b866e982a15 - + https://github.com/dotnet/diagnostics - 1f6a0ea3f4d8ced5dc5d640672d3c9b8f373d6fc + befc445e2e8766e54c9edaafe3a852810c5477b0 - + https://github.com/dotnet/diagnostics - 1f6a0ea3f4d8ced5dc5d640672d3c9b8f373d6fc + befc445e2e8766e54c9edaafe3a852810c5477b0 https://github.com/dotnet/command-line-api diff --git a/eng/Versions.props b/eng/Versions.props index 3bda0115027..5642bbc0729 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24209.3 - 8.0.0-preview.24212.2 - 8.0.0-preview.24212.2 + 8.0.0-preview.24215.1 + 8.0.0-preview.24215.1 9.0.100-preview.4.24215.2 From a460c5e2e013d64069797aeb38687ffb1a02ebc5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 19 Apr 2024 23:13:05 -0700 Subject: [PATCH 157/568] Update dependencies from https://github.com/dotnet/diagnostics build 20240416.1 (#6466) Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe , Microsoft.FileFormats From Version 8.0.0-preview.24215.1 -> To Version 8.0.0-preview.24216.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 6 +++--- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 20fa9fea763..b34ec3cf4be 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore 81355450754f0e6471244b7f1f457b866e982a15 - + https://github.com/dotnet/diagnostics - befc445e2e8766e54c9edaafe3a852810c5477b0 + 0e4d4b6398922342e69d8d07843ab62933171505 - + https://github.com/dotnet/diagnostics - befc445e2e8766e54c9edaafe3a852810c5477b0 + 0e4d4b6398922342e69d8d07843ab62933171505 https://github.com/dotnet/command-line-api @@ -46,9 +46,9 @@ https://github.com/dotnet/arcade 87b015b938e5400d6e57afd7650348c17a764b73 - - https://github.com/dotnet/symstore - 550601c12a227c87ded32316345934101a8a2422 + + https://github.com/dotnet/diagnostics + 0e4d4b6398922342e69d8d07843ab62933171505 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 5642bbc0729..20be07c320a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24209.3 - 8.0.0-preview.24215.1 - 8.0.0-preview.24215.1 + 8.0.0-preview.24216.1 + 8.0.0-preview.24216.1 9.0.100-preview.4.24215.2 @@ -67,7 +67,7 @@ 9.0.0-preview.4.24211.4 9.0.0-preview.4.24211.4 - 1.0.517501 + 8.0.0-preview.24216.1 $(MicrosoftNETCoreApp31Version) From 76c92f4762e0f86ba221e44d7898d41fab061227 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 19 Apr 2024 23:13:22 -0700 Subject: [PATCH 158/568] Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20240416.2 (#6463) Microsoft.CodeAnalysis.NetAnalyzers From Version 9.0.0-preview.24212.1 -> To Version 9.0.0-preview.24216.2 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b34ec3cf4be..fc7609ec08a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -18,9 +18,9 @@ - + https://github.com/dotnet/roslyn-analyzers - 4d72fc19879fbc78a12d3a84ed60e7d17777d8b7 + b07c100bfc66013a8444172d00cfa04c9ceb5a97 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 20be07c320a..76e755d105a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -62,7 +62,7 @@ 9.0.100-preview.4.24215.2 - 9.0.0-preview.24212.1 + 9.0.0-preview.24216.2 9.0.0-preview.4.24211.4 9.0.0-preview.4.24211.4 From 0a5583f79a431848442b3dfac76281c76826dd70 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 19 Apr 2024 23:13:58 -0700 Subject: [PATCH 159/568] [feature/9.x] Update dependencies from dotnet/arcade (#6467) * Update dependencies from https://github.com/dotnet/arcade build 20240417.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.24212.4 -> To Version 9.0.0-beta.24217.1 * Update dependencies from https://github.com/dotnet/arcade build 20240417.5 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.24212.4 -> To Version 9.0.0-beta.24217.5 * Update dependencies from https://github.com/dotnet/arcade build 20240419.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.24212.4 -> To Version 9.0.0-beta.24219.1 --------- Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 20 +++++++++---------- eng/Versions.props | 6 +++--- eng/common/build.ps1 | 4 +--- eng/common/build.sh | 8 -------- eng/common/templates-official/job/job.yml | 2 +- .../templates-official/job/onelocbuild.yml | 2 +- .../templates-official/job/source-build.yml | 2 +- .../post-build/post-build.yml | 6 +++--- .../variables/pool-providers.yml | 2 +- global.json | 6 +++--- 10 files changed, 24 insertions(+), 34 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fc7609ec08a..46fc7fbaa40 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,29 +22,29 @@ https://github.com/dotnet/roslyn-analyzers b07c100bfc66013a8444172d00cfa04c9ceb5a97 - + https://github.com/dotnet/arcade - 87b015b938e5400d6e57afd7650348c17a764b73 + b4f4d40741f161e2c0d96c19c51a4013850ef65f - + https://github.com/dotnet/arcade - 87b015b938e5400d6e57afd7650348c17a764b73 + b4f4d40741f161e2c0d96c19c51a4013850ef65f - + https://github.com/dotnet/arcade - 87b015b938e5400d6e57afd7650348c17a764b73 + b4f4d40741f161e2c0d96c19c51a4013850ef65f - + https://github.com/dotnet/arcade - 87b015b938e5400d6e57afd7650348c17a764b73 + b4f4d40741f161e2c0d96c19c51a4013850ef65f https://github.com/dotnet/installer 7380c301c1ce7d022dd365dd78c4004a2881edaf - + https://github.com/dotnet/arcade - 87b015b938e5400d6e57afd7650348c17a764b73 + b4f4d40741f161e2c0d96c19c51a4013850ef65f https://github.com/dotnet/diagnostics diff --git a/eng/Versions.props b/eng/Versions.props index 76e755d105a..fa6d3656fd7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,9 +48,9 @@ --> - 9.0.0-beta.24212.4 - 9.0.0-beta.24212.4 - 9.0.0-beta.24212.4 + 9.0.0-beta.24219.1 + 9.0.0-beta.24219.1 + 9.0.0-beta.24219.1 9.0.0-preview.4.24213.1 9.0.0-preview.4.24213.1 diff --git a/eng/common/build.ps1 b/eng/common/build.ps1 index 83e6d82e027..438f9920c43 100644 --- a/eng/common/build.ps1 +++ b/eng/common/build.ps1 @@ -19,7 +19,6 @@ Param( [switch] $pack, [switch] $publish, [switch] $clean, - [switch] $verticalBuild, [switch][Alias('pb')]$productBuild, [switch][Alias('bl')]$binaryLog, [switch][Alias('nobl')]$excludeCIBinarylog, @@ -60,7 +59,6 @@ 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 " -productBuild Build the solution in the way it will be built in the full .NET product (VMR) build (short: -pb)" Write-Host "" @@ -124,7 +122,7 @@ function Build { /p:Deploy=$deploy ` /p:Test=$test ` /p:Pack=$pack ` - /p:DotNetBuildRepo=$($productBuild -or $verticalBuild) ` + /p:DotNetBuildRepo=$productBuild ` /p:IntegrationTest=$integrationTest ` /p:PerformanceTest=$performanceTest ` /p:Sign=$sign ` diff --git a/eng/common/build.sh b/eng/common/build.sh index d82ebf74280..ac1ee8620cd 100755 --- a/eng/common/build.sh +++ b/eng/common/build.sh @@ -62,7 +62,6 @@ scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" restore=false build=false source_build=false -vertical_build=false product_build=false rebuild=false test=false @@ -141,13 +140,6 @@ while [[ $# > 0 ]]; do restore=true pack=true ;; - -verticalbuild|-vb) - build=true - vertical_build=true - product_build=true - restore=true - pack=true - ;; -test|-t) test=true ;; diff --git a/eng/common/templates-official/job/job.yml b/eng/common/templates-official/job/job.yml index c63e17e863e..761acc5eb62 100644 --- a/eng/common/templates-official/job/job.yml +++ b/eng/common/templates-official/job/job.yml @@ -210,7 +210,7 @@ jobs: - task: 1ES.PublishPipelineArtifact@1 inputs: targetPath: 'artifacts/log' - artifactName: ${{ coalesce(parameters.artifacts.publish.logs.name, 'Logs_Build_$(Agent.Os)_$(_BuildConfig)') }} + artifactName: ${{ coalesce(parameters.artifacts.publish.logs.name, 'Logs_Build_$(Agent.Os)_$(_BuildConfig)_Attempt$(System.JobAttempt)') }} displayName: 'Publish logs' continueOnError: true condition: always() diff --git a/eng/common/templates-official/job/onelocbuild.yml b/eng/common/templates-official/job/onelocbuild.yml index ba9ba493032..52b4d05d3f8 100644 --- a/eng/common/templates-official/job/onelocbuild.yml +++ b/eng/common/templates-official/job/onelocbuild.yml @@ -56,7 +56,7 @@ jobs: # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: name: $(DncEngInternalBuildPool) - image: 1es-windows-2022-pt + image: 1es-windows-2022 os: windows steps: diff --git a/eng/common/templates-official/job/source-build.yml b/eng/common/templates-official/job/source-build.yml index c918720931f..2180e97a284 100644 --- a/eng/common/templates-official/job/source-build.yml +++ b/eng/common/templates-official/job/source-build.yml @@ -52,7 +52,7 @@ jobs: ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')] - image: 1es-mariner-2-pt + image: 1es-mariner-2 os: linux ${{ if ne(parameters.platform.pool, '') }}: diff --git a/eng/common/templates-official/post-build/post-build.yml b/eng/common/templates-official/post-build/post-build.yml index d286e956bdf..da1f40958b4 100644 --- a/eng/common/templates-official/post-build/post-build.yml +++ b/eng/common/templates-official/post-build/post-build.yml @@ -110,7 +110,7 @@ stages: # If it's not devdiv, it's dnceng ${{ else }}: name: $(DncEngInternalBuildPool) - image: 1es-windows-2022-pt + image: 1es-windows-2022 os: windows steps: @@ -150,7 +150,7 @@ stages: # If it's not devdiv, it's dnceng ${{ else }}: name: $(DncEngInternalBuildPool) - image: 1es-windows-2022-pt + image: 1es-windows-2022 os: windows steps: - template: setup-maestro-vars.yml @@ -208,7 +208,7 @@ stages: # If it's not devdiv, it's dnceng ${{ else }}: name: $(DncEngInternalBuildPool) - image: 1es-windows-2022-pt + image: 1es-windows-2022 os: windows steps: - template: setup-maestro-vars.yml diff --git a/eng/common/templates-official/variables/pool-providers.yml b/eng/common/templates-official/variables/pool-providers.yml index beab7d1bfba..1f308b24efc 100644 --- a/eng/common/templates-official/variables/pool-providers.yml +++ b/eng/common/templates-official/variables/pool-providers.yml @@ -23,7 +23,7 @@ # # pool: # name: $(DncEngInternalBuildPool) -# image: 1es-windows-2022-pt +# image: 1es-windows-2022 variables: # Coalesce the target and source branches so we know when a PR targets a release branch diff --git a/global.json b/global.json index bd0ae85c94e..3a4991720a1 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "9.0.100-preview.1.24101.2", + "dotnet": "9.0.100-preview.3.24204.13", "runtimes": { "aspnetcore": [ "$(MicrosoftAspNetCoreApp60Version)", @@ -31,7 +31,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24212.4", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24212.4" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24219.1", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24219.1" } } From f5c1ec28fb6df33e04e275cadc114f9dc54cfcf1 Mon Sep 17 00:00:00 2001 From: Wiktor Kopec Date: Fri, 19 Apr 2024 23:36:32 -0700 Subject: [PATCH 160/568] Remove test diablements (#5911) --- .../CollectDumpActionTests.cs | 7 ------- .../Fixtures/AzuriteFixture.cs | 6 ------ .../DumpTests.cs | 2 +- 3 files changed, 1 insertion(+), 14 deletions(-) diff --git a/src/Tests/CollectionRuleActions.UnitTests/CollectDumpActionTests.cs b/src/Tests/CollectionRuleActions.UnitTests/CollectDumpActionTests.cs index 41fa98c7db7..0b3b042f712 100644 --- a/src/Tests/CollectionRuleActions.UnitTests/CollectDumpActionTests.cs +++ b/src/Tests/CollectionRuleActions.UnitTests/CollectDumpActionTests.cs @@ -53,13 +53,6 @@ private async Task CollectDumpAction_SuccessCore(TargetFrameworkMoniker tfm, Dum return; } - // TODO net9.0temporary Linux dump collection does not work properly for .net90 - if (tfm == TargetFrameworkMoniker.Net90 - && !RuntimeInformation.IsOSPlatform(OSPlatform.Windows) && !RuntimeInformation.IsOSPlatform(OSPlatform.OSX)) - { - return; - } - using TemporaryDirectory tempDirectory = new(_outputHelper); await TestHostHelper.CreateCollectionRulesHost(_outputHelper, rootOptions => diff --git a/src/Tests/Microsoft.Diagnostics.Monitoring.TestCommon/Fixtures/AzuriteFixture.cs b/src/Tests/Microsoft.Diagnostics.Monitoring.TestCommon/Fixtures/AzuriteFixture.cs index 47983d9a510..47d94505b80 100644 --- a/src/Tests/Microsoft.Diagnostics.Monitoring.TestCommon/Fixtures/AzuriteFixture.cs +++ b/src/Tests/Microsoft.Diagnostics.Monitoring.TestCommon/Fixtures/AzuriteFixture.cs @@ -186,12 +186,6 @@ public void SkipTestIfNotAvailable() { throw new SkipTestException(_startupErrorMessage); } - - // TODO net9.0temporary Azure for net9.0 Linux arm64 does not work correctly - if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux) && (RuntimeInformation.ProcessArchitecture == Architecture.Arm64)) - { - throw new SkipTestException("Azure for net9.0 Linux arm64 does not work correctly"); - } } private void ParseAzuriteStartupOutput(object sender, DataReceivedEventArgs e) diff --git a/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests/DumpTests.cs b/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests/DumpTests.cs index e1ca3f3b17f..2aa5f7f7199 100644 --- a/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests/DumpTests.cs +++ b/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests/DumpTests.cs @@ -33,7 +33,7 @@ public DumpTests(ITestOutputHelper outputHelper, ServiceProviderFixture serviceP _outputHelper = outputHelper; } - [Theory(Skip = "net9.0temporary Linux dump collection does not work properly for .net90")] + [Theory()] [InlineData(DiagnosticPortConnectionMode.Connect, DumpType.Full)] [InlineData(DiagnosticPortConnectionMode.Connect, DumpType.Mini)] [InlineData(DiagnosticPortConnectionMode.Connect, DumpType.Triage)] From 63a50d28ead93d692cc890671c52cd6ebd4bc2cf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 20 Apr 2024 14:51:30 +0000 Subject: [PATCH 161/568] Update dependencies from https://github.com/dotnet/arcade build 20240419.5 (#6484) [feature/9.x] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- eng/common/cross/toolchain.cmake | 20 ++++++++++++++++++++ global.json | 4 ++-- 4 files changed, 35 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 46fc7fbaa40..a67f168381b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,29 +22,29 @@ https://github.com/dotnet/roslyn-analyzers b07c100bfc66013a8444172d00cfa04c9ceb5a97 - + https://github.com/dotnet/arcade - b4f4d40741f161e2c0d96c19c51a4013850ef65f + 6b1c5542109fd5d89a9bde9eb6aacb0ad04e18bc - + https://github.com/dotnet/arcade - b4f4d40741f161e2c0d96c19c51a4013850ef65f + 6b1c5542109fd5d89a9bde9eb6aacb0ad04e18bc - + https://github.com/dotnet/arcade - b4f4d40741f161e2c0d96c19c51a4013850ef65f + 6b1c5542109fd5d89a9bde9eb6aacb0ad04e18bc - + https://github.com/dotnet/arcade - b4f4d40741f161e2c0d96c19c51a4013850ef65f + 6b1c5542109fd5d89a9bde9eb6aacb0ad04e18bc https://github.com/dotnet/installer 7380c301c1ce7d022dd365dd78c4004a2881edaf - + https://github.com/dotnet/arcade - b4f4d40741f161e2c0d96c19c51a4013850ef65f + 6b1c5542109fd5d89a9bde9eb6aacb0ad04e18bc https://github.com/dotnet/diagnostics diff --git a/eng/Versions.props b/eng/Versions.props index fa6d3656fd7..a4e620b885b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,9 +48,9 @@ --> - 9.0.0-beta.24219.1 - 9.0.0-beta.24219.1 - 9.0.0-beta.24219.1 + 9.0.0-beta.24219.5 + 9.0.0-beta.24219.5 + 9.0.0-beta.24219.5 9.0.0-preview.4.24213.1 9.0.0-preview.4.24213.1 diff --git a/eng/common/cross/toolchain.cmake b/eng/common/cross/toolchain.cmake index 3762640fdcf..9a4e285a5ae 100644 --- a/eng/common/cross/toolchain.cmake +++ b/eng/common/cross/toolchain.cmake @@ -382,6 +382,26 @@ if(TARGET_ARCH_NAME MATCHES "^(arm|armel|x86)$") endif() endif() +# Set C++ standard library options if specified +set(CLR_CMAKE_CXX_STANDARD_LIBRARY "" CACHE STRING "Standard library flavor to link against. Only supported with the Clang compiler.") +if (CLR_CMAKE_CXX_STANDARD_LIBRARY) + add_compile_options($<$:--stdlib=${CLR_CMAKE_CXX_STANDARD_LIBRARY}>) + add_link_options($<$:--stdlib=${CLR_CMAKE_CXX_STANDARD_LIBRARY}>) +endif() + +option(CLR_CMAKE_CXX_STANDARD_LIBRARY_STATIC "Statically link against the C++ standard library" OFF) +if(CLR_CMAKE_CXX_STANDARD_LIBRARY_STATIC) + add_link_options($<$:-static-libstdc++>) +endif() + +set(CLR_CMAKE_CXX_ABI_LIBRARY "" CACHE STRING "C++ ABI implementation library to link against. Only supported with the Clang compiler.") +if (CLR_CMAKE_CXX_ABI_LIBRARY) + # The user may specify the ABI library with the 'lib' prefix, like 'libstdc++'. Strip the prefix here so the linker finds the right library. + string(REGEX REPLACE "^lib(.+)" "\\1" CLR_CMAKE_CXX_ABI_LIBRARY ${CLR_CMAKE_CXX_ABI_LIBRARY}) + # We need to specify this as a linker-backend option as Clang will filter this option out when linking to libc++. + add_link_options("LINKER:-l${CLR_CMAKE_CXX_ABI_LIBRARY}") +endif() + set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) diff --git a/global.json b/global.json index 3a4991720a1..3634eb27a19 100644 --- a/global.json +++ b/global.json @@ -31,7 +31,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24219.1", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24219.1" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24219.5", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24219.5" } } From 502b01180286f3e1faf5caa65f0fe91382f4f3ea Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 21 Apr 2024 14:43:16 +0000 Subject: [PATCH 162/568] [feature/9.x] Update dependencies from dotnet/diagnostics (#6483) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a67f168381b..1e3ec2e09fd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore 81355450754f0e6471244b7f1f457b866e982a15 - + https://github.com/dotnet/diagnostics - 0e4d4b6398922342e69d8d07843ab62933171505 + c206de0ffb36baa05722c3f43f40c9b4eeb1e5aa - + https://github.com/dotnet/diagnostics - 0e4d4b6398922342e69d8d07843ab62933171505 + c206de0ffb36baa05722c3f43f40c9b4eeb1e5aa https://github.com/dotnet/command-line-api @@ -46,9 +46,9 @@ https://github.com/dotnet/arcade 6b1c5542109fd5d89a9bde9eb6aacb0ad04e18bc - + https://github.com/dotnet/diagnostics - 0e4d4b6398922342e69d8d07843ab62933171505 + c206de0ffb36baa05722c3f43f40c9b4eeb1e5aa https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index a4e620b885b..87aa1ed7e68 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24209.3 - 8.0.0-preview.24216.1 - 8.0.0-preview.24216.1 + 8.0.0-preview.24219.1 + 8.0.0-preview.24219.1 9.0.100-preview.4.24215.2 @@ -67,7 +67,7 @@ 9.0.0-preview.4.24211.4 9.0.0-preview.4.24211.4 - 8.0.0-preview.24216.1 + 8.0.0-preview.24219.1 $(MicrosoftNETCoreApp31Version) From f3f104dfa00da6694ec0a90609787d4c03fa5ec1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 22 Apr 2024 17:30:17 +0000 Subject: [PATCH 163/568] [feature/9.x] Update dependencies from dotnet/installer (#6462) * Update dependencies from https://github.com/dotnet/installer build 20240415.10 Microsoft.Dotnet.Sdk.Internal From Version 9.0.100-preview.4.24215.2 -> To Version 9.0.100-preview.4.24215.10 * Update dependencies from https://github.com/dotnet/installer build 20240417.1 Microsoft.Dotnet.Sdk.Internal From Version 9.0.100-preview.4.24215.2 -> To Version 9.0.100-preview.4.24217.1 Dependency coherency updates Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0 From Version 9.0.0-preview.4.24213.1 -> To Version 9.0.0-preview.4.24216.18 (parent: Microsoft.Dotnet.Sdk.Internal * Update dependencies from https://github.com/dotnet/installer build 20240418.1 Microsoft.Dotnet.Sdk.Internal From Version 9.0.100-preview.4.24215.2 -> To Version 9.0.100-preview.4.24218.1 Dependency coherency updates Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0 From Version 9.0.0-preview.4.24213.1 -> To Version 9.0.0-preview.4.24216.18 (parent: Microsoft.Dotnet.Sdk.Internal * Update dependencies from https://github.com/dotnet/installer build 20240418.26 Microsoft.Dotnet.Sdk.Internal From Version 9.0.100-preview.4.24215.2 -> To Version 9.0.100-preview.4.24218.26 Dependency coherency updates Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0 From Version 9.0.0-preview.4.24213.1 -> To Version 9.0.0-preview.4.24218.1 (parent: Microsoft.Dotnet.Sdk.Internal * Update dependencies from https://github.com/dotnet/installer build 20240419.20 Microsoft.Dotnet.Sdk.Internal From Version 9.0.100-preview.4.24215.2 -> To Version 9.0.100-preview.4.24219.20 Dependency coherency updates Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0 From Version 9.0.0-preview.4.24213.1 -> To Version 9.0.0-preview.4.24218.1 (parent: Microsoft.Dotnet.Sdk.Internal * Update dependencies from https://github.com/dotnet/installer build 20240419.20 Microsoft.Dotnet.Sdk.Internal From Version 9.0.100-preview.4.24215.2 -> To Version 9.0.100-preview.4.24219.20 Dependency coherency updates Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0 From Version 9.0.0-preview.4.24213.1 -> To Version 9.0.0-preview.4.24218.1 (parent: Microsoft.Dotnet.Sdk.Internal * Update dependencies from https://github.com/dotnet/installer build 20240421.5 Microsoft.Dotnet.Sdk.Internal From Version 9.0.100-preview.4.24215.2 -> To Version 9.0.100-preview.4.24221.5 Dependency coherency updates Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0 From Version 9.0.0-preview.4.24213.1 -> To Version 9.0.0-preview.4.24218.1 (parent: Microsoft.Dotnet.Sdk.Internal * Update schema baseline --------- Co-authored-by: dotnet-maestro[bot] Co-authored-by: Justin Anderson --- documentation/schema.json | 3 +++ eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 3 files changed, 18 insertions(+), 15 deletions(-) diff --git a/documentation/schema.json b/documentation/schema.json index 7215cd8201f..90c129f27d4 100644 --- a/documentation/schema.json +++ b/documentation/schema.json @@ -2702,6 +2702,9 @@ }, "SkipValidation": { "type": "boolean" + }, + "NewLine": { + "type": "string" } } }, diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1e3ec2e09fd..225cfcc7d14 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/aspnetcore - 81355450754f0e6471244b7f1f457b866e982a15 + 7d5309210d8f7bae8fa074da495e9d009d67f1b4 https://github.com/dotnet/diagnostics @@ -38,9 +38,9 @@ https://github.com/dotnet/arcade 6b1c5542109fd5d89a9bde9eb6aacb0ad04e18bc - + https://github.com/dotnet/installer - 7380c301c1ce7d022dd365dd78c4004a2881edaf + 22ffa42d6c777ea9381459c83d4d9977744db2c8 https://github.com/dotnet/arcade @@ -50,17 +50,17 @@ https://github.com/dotnet/diagnostics c206de0ffb36baa05722c3f43f40c9b4eeb1e5aa - + https://github.com/dotnet/runtime - 93010da2628bcd16aaea0288d52a7af8d4542037 + b0118bebe385cb68f272a32ca6a5c5bb53c9b14f - + https://github.com/dotnet/aspnetcore - 81355450754f0e6471244b7f1f457b866e982a15 + 7d5309210d8f7bae8fa074da495e9d009d67f1b4 - + https://github.com/dotnet/runtime - 93010da2628bcd16aaea0288d52a7af8d4542037 + b0118bebe385cb68f272a32ca6a5c5bb53c9b14f diff --git a/eng/Versions.props b/eng/Versions.props index 87aa1ed7e68..60157a8573a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,20 +52,20 @@ 9.0.0-beta.24219.5 9.0.0-beta.24219.5 - 9.0.0-preview.4.24213.1 - 9.0.0-preview.4.24213.1 + 9.0.0-preview.4.24218.1 + 9.0.0-preview.4.24218.1 2.0.0-beta4.24209.3 8.0.0-preview.24219.1 8.0.0-preview.24219.1 - 9.0.100-preview.4.24215.2 + 9.0.100-preview.4.24221.5 9.0.0-preview.24216.2 - 9.0.0-preview.4.24211.4 - 9.0.0-preview.4.24211.4 + 9.0.0-preview.4.24218.7 + 9.0.0-preview.4.24218.7 8.0.0-preview.24219.1 From 0a57f2fd80aff573bc59a717fb78f87fa7ab0a81 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 23 Apr 2024 14:40:28 +0000 Subject: [PATCH 164/568] Update dependencies from https://github.com/dotnet/diagnostics build 20240422.1 (#6493) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 225cfcc7d14..3695825ee06 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore 7d5309210d8f7bae8fa074da495e9d009d67f1b4 - + https://github.com/dotnet/diagnostics - c206de0ffb36baa05722c3f43f40c9b4eeb1e5aa + 48bebfdbf02dd6118c459aca276a88d28ebbb9a2 - + https://github.com/dotnet/diagnostics - c206de0ffb36baa05722c3f43f40c9b4eeb1e5aa + 48bebfdbf02dd6118c459aca276a88d28ebbb9a2 https://github.com/dotnet/command-line-api @@ -46,9 +46,9 @@ https://github.com/dotnet/arcade 6b1c5542109fd5d89a9bde9eb6aacb0ad04e18bc - + https://github.com/dotnet/diagnostics - c206de0ffb36baa05722c3f43f40c9b4eeb1e5aa + 48bebfdbf02dd6118c459aca276a88d28ebbb9a2 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 60157a8573a..4e8a4ecea2e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24209.3 - 8.0.0-preview.24219.1 - 8.0.0-preview.24219.1 + 8.0.0-preview.24222.1 + 8.0.0-preview.24222.1 9.0.100-preview.4.24221.5 @@ -67,7 +67,7 @@ 9.0.0-preview.4.24218.7 9.0.0-preview.4.24218.7 - 8.0.0-preview.24219.1 + 8.0.0-preview.24222.1 $(MicrosoftNETCoreApp31Version) From f391e49f53bc2272097170e9cd2dd4cee1859e0f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 23 Apr 2024 11:40:29 -0700 Subject: [PATCH 165/568] Update dependencies from https://github.com/dotnet/installer build 20240423.1 (#6495) Microsoft.Dotnet.Sdk.Internal From Version 9.0.100-preview.4.24221.5 -> To Version 9.0.100-preview.4.24223.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3695825ee06..291be65f762 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -38,9 +38,9 @@ https://github.com/dotnet/arcade 6b1c5542109fd5d89a9bde9eb6aacb0ad04e18bc - + https://github.com/dotnet/installer - 22ffa42d6c777ea9381459c83d4d9977744db2c8 + e99dabfa3ffa2dd963ab626af498f32b570a4917 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 4e8a4ecea2e..36973976766 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -60,7 +60,7 @@ 8.0.0-preview.24222.1 8.0.0-preview.24222.1 - 9.0.100-preview.4.24221.5 + 9.0.100-preview.4.24223.1 9.0.0-preview.24216.2 From 322f98de7249f30fad7ebeb20779a24f87a85df0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 24 Apr 2024 14:43:46 +0000 Subject: [PATCH 166/568] Update dependencies from https://github.com/dotnet/diagnostics build 20240423.1 (#6513) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 291be65f762..7bfe3a3ff3f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore 7d5309210d8f7bae8fa074da495e9d009d67f1b4 - + https://github.com/dotnet/diagnostics - 48bebfdbf02dd6118c459aca276a88d28ebbb9a2 + 790499a1645b913e18f32b145bd5f5090a7d86a3 - + https://github.com/dotnet/diagnostics - 48bebfdbf02dd6118c459aca276a88d28ebbb9a2 + 790499a1645b913e18f32b145bd5f5090a7d86a3 https://github.com/dotnet/command-line-api @@ -46,9 +46,9 @@ https://github.com/dotnet/arcade 6b1c5542109fd5d89a9bde9eb6aacb0ad04e18bc - + https://github.com/dotnet/diagnostics - 48bebfdbf02dd6118c459aca276a88d28ebbb9a2 + 790499a1645b913e18f32b145bd5f5090a7d86a3 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 36973976766..cf44bb835e6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24209.3 - 8.0.0-preview.24222.1 - 8.0.0-preview.24222.1 + 8.0.0-preview.24223.1 + 8.0.0-preview.24223.1 9.0.100-preview.4.24223.1 @@ -67,7 +67,7 @@ 9.0.0-preview.4.24218.7 9.0.0-preview.4.24218.7 - 8.0.0-preview.24222.1 + 8.0.0-preview.24223.1 $(MicrosoftNETCoreApp31Version) From 5360a7792fdccccd33a7fe6f8c5d02c6901c18a3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 25 Apr 2024 10:59:57 -0700 Subject: [PATCH 167/568] Update dependencies from https://github.com/dotnet/diagnostics build 20240424.1 (#6519) Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe , Microsoft.FileFormats From Version 8.0.0-preview.24223.1 -> To Version 8.0.0-preview.24224.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7bfe3a3ff3f..750268dc18d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore 7d5309210d8f7bae8fa074da495e9d009d67f1b4 - + https://github.com/dotnet/diagnostics - 790499a1645b913e18f32b145bd5f5090a7d86a3 + 4380830df2cae1aa5c814a22c3b2794d1939adaf - + https://github.com/dotnet/diagnostics - 790499a1645b913e18f32b145bd5f5090a7d86a3 + 4380830df2cae1aa5c814a22c3b2794d1939adaf https://github.com/dotnet/command-line-api @@ -46,9 +46,9 @@ https://github.com/dotnet/arcade 6b1c5542109fd5d89a9bde9eb6aacb0ad04e18bc - + https://github.com/dotnet/diagnostics - 790499a1645b913e18f32b145bd5f5090a7d86a3 + 4380830df2cae1aa5c814a22c3b2794d1939adaf https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index cf44bb835e6..d9252b0b3b7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24209.3 - 8.0.0-preview.24223.1 - 8.0.0-preview.24223.1 + 8.0.0-preview.24224.1 + 8.0.0-preview.24224.1 9.0.100-preview.4.24223.1 @@ -67,7 +67,7 @@ 9.0.0-preview.4.24218.7 9.0.0-preview.4.24218.7 - 8.0.0-preview.24223.1 + 8.0.0-preview.24224.1 $(MicrosoftNETCoreApp31Version) From e33db22dd7c152a7c28ef5a53fc7862a36248db6 Mon Sep 17 00:00:00 2001 From: Justin Anderson Date: Thu, 25 Apr 2024 11:47:25 -0700 Subject: [PATCH 168/568] Update MacOS version to 12 (#6522) --- eng/pipelines/jobs/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/jobs/build.yml b/eng/pipelines/jobs/build.yml index 630ac4971e2..6c2c33613c4 100644 --- a/eng/pipelines/jobs/build.yml +++ b/eng/pipelines/jobs/build.yml @@ -70,7 +70,7 @@ jobs: ${{ if in(parameters.osGroup, 'MacOS') }}: pool: name: Azure Pipelines - vmImage: macos-11 + vmImage: macos-12 os: macOS ${{ if ne(parameters.container, '') }}: From 505d2f4f499b69470d128b0278fd10da934cf4b0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 26 Apr 2024 14:23:50 +0000 Subject: [PATCH 169/568] Update dependencies from https://github.com/dotnet/diagnostics build 20240425.1 (#6526) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 750268dc18d..cd1dfdcb2ff 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore 7d5309210d8f7bae8fa074da495e9d009d67f1b4 - + https://github.com/dotnet/diagnostics - 4380830df2cae1aa5c814a22c3b2794d1939adaf + 287467a77bcff8b5b2c2bcc04e59b5ee56079a65 - + https://github.com/dotnet/diagnostics - 4380830df2cae1aa5c814a22c3b2794d1939adaf + 287467a77bcff8b5b2c2bcc04e59b5ee56079a65 https://github.com/dotnet/command-line-api @@ -46,9 +46,9 @@ https://github.com/dotnet/arcade 6b1c5542109fd5d89a9bde9eb6aacb0ad04e18bc - + https://github.com/dotnet/diagnostics - 4380830df2cae1aa5c814a22c3b2794d1939adaf + 287467a77bcff8b5b2c2bcc04e59b5ee56079a65 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index d9252b0b3b7..a8f45f3bae0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24209.3 - 8.0.0-preview.24224.1 - 8.0.0-preview.24224.1 + 8.0.0-preview.24225.1 + 8.0.0-preview.24225.1 9.0.100-preview.4.24223.1 @@ -67,7 +67,7 @@ 9.0.0-preview.4.24218.7 9.0.0-preview.4.24218.7 - 8.0.0-preview.24224.1 + 8.0.0-preview.24225.1 $(MicrosoftNETCoreApp31Version) From 88f975ae91ce6e5d17a4451671312ed4043db241 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 26 Apr 2024 08:45:34 -0700 Subject: [PATCH 170/568] [feature/9.x] Update dependencies from dotnet/arcade (#6520) * Update dependencies from https://github.com/dotnet/arcade build 20240423.8 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.24219.5 -> To Version 9.0.0-beta.24223.8 * Update dependencies from https://github.com/dotnet/arcade build 20240424.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.24219.5 -> To Version 9.0.0-beta.24224.2 --------- Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 20 +- eng/Versions.props | 6 +- eng/common/core-templates/job/job.yml | 266 ++++++++++++++ eng/common/core-templates/job/onelocbuild.yml | 121 +++++++ .../job/publish-build-assets.yml | 172 ++++++++++ .../core-templates/job/source-build.yml | 80 +++++ .../job/source-index-stage1.yml | 73 ++++ .../core-templates/jobs/codeql-build.yml | 33 ++ eng/common/core-templates/jobs/jobs.yml | 119 +++++++ .../core-templates/jobs/source-build.yml | 50 +++ .../post-build/common-variables.yml | 24 ++ .../core-templates/post-build/post-build.yml | 298 ++++++++++++++++ .../post-build/setup-maestro-vars.yml | 74 ++++ .../post-build/trigger-subscription.yml | 13 + .../steps/add-build-to-channel.yml | 13 + .../steps/component-governance.yml | 14 + .../core-templates/steps/generate-sbom.yml | 54 +++ .../steps/publish-build-artifacts.yml | 20 ++ .../core-templates/steps/publish-logs.yml | 59 ++++ .../steps/publish-pipeline-artifacts.yml | 20 ++ .../core-templates/steps/retain-build.yml | 28 ++ .../core-templates/steps/send-to-helix.yml | 93 +++++ .../core-templates/steps/source-build.yml | 134 ++++++++ .../variables/pool-providers.yml | 8 + eng/common/sdk-task.ps1 | 2 +- eng/common/template-guidance.md | 137 ++++++++ eng/common/templates-official/job/job.yml | 324 ++++-------------- .../templates-official/job/onelocbuild.yml | 115 +------ .../job/publish-build-assets.yml | 162 +-------- .../templates-official/job/source-build.yml | 70 +--- .../job/source-index-stage1.yml | 70 +--- .../templates-official/jobs/codeql-build.yml | 32 +- eng/common/templates-official/jobs/jobs.yml | 100 +----- .../templates-official/jobs/source-build.yml | 49 +-- .../post-build/common-variables.yml | 28 +- .../post-build/post-build.yml | 289 +--------------- .../post-build/setup-maestro-vars.yml | 74 +--- .../steps/add-build-to-channel.yml | 18 +- .../steps/component-governance.yml | 18 +- .../steps/generate-sbom.yml | 51 +-- .../steps/publish-build-artifacts.yml | 41 +++ .../templates-official/steps/publish-logs.yml | 54 +-- .../steps/publish-pipeline-artifacts.yml | 26 ++ .../templates-official/steps/retain-build.yml | 33 +- .../steps/send-to-helix.yml | 98 +----- .../templates-official/steps/source-build.yml | 134 +------- eng/common/templates/job/execute-sdl.yml | 139 -------- eng/common/templates/job/job.yml | 315 +++-------------- eng/common/templates/job/onelocbuild.yml | 112 +----- .../templates/job/publish-build-assets.yml | 158 +-------- eng/common/templates/job/source-build.yml | 69 +--- .../templates/job/source-index-stage1.yml | 70 +--- eng/common/templates/jobs/codeql-build.yml | 32 +- eng/common/templates/jobs/jobs.yml | 100 +----- eng/common/templates/jobs/source-build.yml | 49 +-- .../templates/post-build/common-variables.yml | 28 +- .../templates/post-build/post-build.yml | 286 +--------------- .../post-build/setup-maestro-vars.yml | 74 +--- .../templates/steps/add-build-to-channel.yml | 18 +- eng/common/templates/steps/build-reason.yml | 12 - .../templates/steps/component-governance.yml | 18 +- eng/common/templates/steps/execute-codeql.yml | 32 -- eng/common/templates/steps/execute-sdl.yml | 88 ----- eng/common/templates/steps/generate-sbom.yml | 51 +-- .../steps/publish-build-artifacts.yml | 40 +++ eng/common/templates/steps/publish-logs.yml | 54 +-- .../steps/publish-pipeline-artifacts.yml | 34 ++ eng/common/templates/steps/retain-build.yml | 33 +- eng/common/templates/steps/run-on-unix.yml | 7 - eng/common/templates/steps/run-on-windows.yml | 7 - .../steps/run-script-ifequalelse.yml | 33 -- eng/common/templates/steps/send-to-helix.yml | 98 +----- eng/common/templates/steps/source-build.yml | 134 +------- eng/common/templates/steps/telemetry-end.yml | 102 ------ .../templates/steps/telemetry-start.yml | 241 ------------- .../templates/variables/pool-providers.yml | 54 +-- .../templates/variables/sdl-variables.yml | 7 - eng/common/tools.ps1 | 4 +- global.json | 4 +- 79 files changed, 2392 insertions(+), 3828 deletions(-) create mode 100644 eng/common/core-templates/job/job.yml create mode 100644 eng/common/core-templates/job/onelocbuild.yml create mode 100644 eng/common/core-templates/job/publish-build-assets.yml create mode 100644 eng/common/core-templates/job/source-build.yml create mode 100644 eng/common/core-templates/job/source-index-stage1.yml create mode 100644 eng/common/core-templates/jobs/codeql-build.yml create mode 100644 eng/common/core-templates/jobs/jobs.yml create mode 100644 eng/common/core-templates/jobs/source-build.yml create mode 100644 eng/common/core-templates/post-build/common-variables.yml create mode 100644 eng/common/core-templates/post-build/post-build.yml create mode 100644 eng/common/core-templates/post-build/setup-maestro-vars.yml create mode 100644 eng/common/core-templates/post-build/trigger-subscription.yml create mode 100644 eng/common/core-templates/steps/add-build-to-channel.yml create mode 100644 eng/common/core-templates/steps/component-governance.yml create mode 100644 eng/common/core-templates/steps/generate-sbom.yml create mode 100644 eng/common/core-templates/steps/publish-build-artifacts.yml create mode 100644 eng/common/core-templates/steps/publish-logs.yml create mode 100644 eng/common/core-templates/steps/publish-pipeline-artifacts.yml create mode 100644 eng/common/core-templates/steps/retain-build.yml create mode 100644 eng/common/core-templates/steps/send-to-helix.yml create mode 100644 eng/common/core-templates/steps/source-build.yml create mode 100644 eng/common/core-templates/variables/pool-providers.yml create mode 100644 eng/common/template-guidance.md create mode 100644 eng/common/templates-official/steps/publish-build-artifacts.yml create mode 100644 eng/common/templates-official/steps/publish-pipeline-artifacts.yml delete mode 100644 eng/common/templates/job/execute-sdl.yml delete mode 100644 eng/common/templates/steps/build-reason.yml delete mode 100644 eng/common/templates/steps/execute-codeql.yml delete mode 100644 eng/common/templates/steps/execute-sdl.yml create mode 100644 eng/common/templates/steps/publish-build-artifacts.yml create mode 100644 eng/common/templates/steps/publish-pipeline-artifacts.yml delete mode 100644 eng/common/templates/steps/run-on-unix.yml delete mode 100644 eng/common/templates/steps/run-on-windows.yml delete mode 100644 eng/common/templates/steps/run-script-ifequalelse.yml delete mode 100644 eng/common/templates/steps/telemetry-end.yml delete mode 100644 eng/common/templates/steps/telemetry-start.yml delete mode 100644 eng/common/templates/variables/sdl-variables.yml diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cd1dfdcb2ff..b135c1a58de 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,29 +22,29 @@ https://github.com/dotnet/roslyn-analyzers b07c100bfc66013a8444172d00cfa04c9ceb5a97 - + https://github.com/dotnet/arcade - 6b1c5542109fd5d89a9bde9eb6aacb0ad04e18bc + 6ca3ae2ae79ef707c76ea1abf82b0787824b6da0 - + https://github.com/dotnet/arcade - 6b1c5542109fd5d89a9bde9eb6aacb0ad04e18bc + 6ca3ae2ae79ef707c76ea1abf82b0787824b6da0 - + https://github.com/dotnet/arcade - 6b1c5542109fd5d89a9bde9eb6aacb0ad04e18bc + 6ca3ae2ae79ef707c76ea1abf82b0787824b6da0 - + https://github.com/dotnet/arcade - 6b1c5542109fd5d89a9bde9eb6aacb0ad04e18bc + 6ca3ae2ae79ef707c76ea1abf82b0787824b6da0 https://github.com/dotnet/installer e99dabfa3ffa2dd963ab626af498f32b570a4917 - + https://github.com/dotnet/arcade - 6b1c5542109fd5d89a9bde9eb6aacb0ad04e18bc + 6ca3ae2ae79ef707c76ea1abf82b0787824b6da0 https://github.com/dotnet/diagnostics diff --git a/eng/Versions.props b/eng/Versions.props index a8f45f3bae0..cf76a2bc3ab 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,9 +48,9 @@ --> - 9.0.0-beta.24219.5 - 9.0.0-beta.24219.5 - 9.0.0-beta.24219.5 + 9.0.0-beta.24224.2 + 9.0.0-beta.24224.2 + 9.0.0-beta.24224.2 9.0.0-preview.4.24218.1 9.0.0-preview.4.24218.1 diff --git a/eng/common/core-templates/job/job.yml b/eng/common/core-templates/job/job.yml new file mode 100644 index 00000000000..dc3bd560a50 --- /dev/null +++ b/eng/common/core-templates/job/job.yml @@ -0,0 +1,266 @@ +parameters: +# Job schema parameters - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#job + cancelTimeoutInMinutes: '' + condition: '' + container: '' + continueOnError: false + dependsOn: '' + displayName: '' + pool: '' + steps: [] + strategy: '' + timeoutInMinutes: '' + variables: [] + workspace: '' + templateContext: {} + +# Job base template specific parameters + # See schema documentation - https://github.com/dotnet/arcade/blob/master/Documentation/AzureDevOps/TemplateSchema.md + # publishing defaults + artifacts: '' + enableMicrobuild: false + enablePublishBuildArtifacts: false + enablePublishBuildAssets: false + enablePublishTestResults: false + enablePublishUsingPipelines: false + enableBuildRetry: false + disableComponentGovernance: '' + componentGovernanceIgnoreDirectories: '' + mergeTestResults: false + testRunTitle: '' + testResultsFormat: '' + name: '' + preSteps: [] + artifactPublishSteps: [] + runAsPublic: false + +# Sbom related params + enableSbom: true + PackageVersion: 9.0.0 + BuildDropPath: '$(Build.SourcesDirectory)/artifacts' + +# 1es specific parameters + is1ESPipeline: '' + +jobs: +- job: ${{ parameters.name }} + + ${{ if ne(parameters.cancelTimeoutInMinutes, '') }}: + cancelTimeoutInMinutes: ${{ parameters.cancelTimeoutInMinutes }} + + ${{ if ne(parameters.condition, '') }}: + condition: ${{ parameters.condition }} + + ${{ if ne(parameters.container, '') }}: + container: ${{ parameters.container }} + + ${{ if ne(parameters.continueOnError, '') }}: + continueOnError: ${{ parameters.continueOnError }} + + ${{ if ne(parameters.dependsOn, '') }}: + dependsOn: ${{ parameters.dependsOn }} + + ${{ if ne(parameters.displayName, '') }}: + displayName: ${{ parameters.displayName }} + + ${{ if ne(parameters.pool, '') }}: + pool: ${{ parameters.pool }} + + ${{ if ne(parameters.strategy, '') }}: + strategy: ${{ parameters.strategy }} + + ${{ if ne(parameters.timeoutInMinutes, '') }}: + timeoutInMinutes: ${{ parameters.timeoutInMinutes }} + + ${{ if ne(parameters.templateContext, '') }}: + templateContext: ${{ parameters.templateContext }} + + variables: + - ${{ if ne(parameters.enableTelemetry, 'false') }}: + - name: DOTNET_CLI_TELEMETRY_PROFILE + value: '$(Build.Repository.Uri)' + - ${{ if eq(parameters.enableRichCodeNavigation, 'true') }}: + - name: EnableRichCodeNavigation + value: 'true' + # Retry signature validation up to three times, waiting 2 seconds between attempts. + # See https://learn.microsoft.com/en-us/nuget/reference/errors-and-warnings/nu3028#retry-untrusted-root-failures + - name: NUGET_EXPERIMENTAL_CHAIN_BUILD_RETRY_POLICY + value: 3,2000 + - ${{ each variable in parameters.variables }}: + # handle name-value variable syntax + # example: + # - name: [key] + # value: [value] + - ${{ if ne(variable.name, '') }}: + - name: ${{ variable.name }} + value: ${{ variable.value }} + + # handle variable groups + - ${{ if ne(variable.group, '') }}: + - group: ${{ variable.group }} + + # handle template variable syntax + # example: + # - template: path/to/template.yml + # parameters: + # [key]: [value] + - ${{ if ne(variable.template, '') }}: + - template: ${{ variable.template }} + ${{ if ne(variable.parameters, '') }}: + parameters: ${{ variable.parameters }} + + # handle key-value variable syntax. + # example: + # - [key]: [value] + - ${{ if and(eq(variable.name, ''), eq(variable.group, ''), eq(variable.template, '')) }}: + - ${{ each pair in variable }}: + - name: ${{ pair.key }} + value: ${{ pair.value }} + + # DotNet-HelixApi-Access provides 'HelixApiAccessToken' for internal builds + - ${{ if and(eq(parameters.enableTelemetry, 'true'), eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - group: DotNet-HelixApi-Access + + ${{ if ne(parameters.workspace, '') }}: + workspace: ${{ parameters.workspace }} + + steps: + - ${{ if eq(parameters.is1ESPipeline, '') }}: + - 'Illegal entry point, is1ESPipeline is not defined. Repository yaml should not directly reference templates in core-templates folder.': error + + - ${{ if ne(parameters.preSteps, '') }}: + - ${{ each preStep in parameters.preSteps }}: + - ${{ preStep }} + + - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - ${{ if eq(parameters.enableMicrobuild, 'true') }}: + - task: MicroBuildSigningPlugin@4 + displayName: Install MicroBuild plugin + inputs: + signType: $(_SignType) + zipSources: false + feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json + env: + TeamName: $(_TeamName) + MicroBuildOutputFolderOverride: '$(Agent.TempDirectory)' + continueOnError: ${{ parameters.continueOnError }} + 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@1 + + - ${{ if and(ne(parameters.artifacts.download, 'false'), ne(parameters.artifacts.download, '')) }}: + - task: DownloadPipelineArtifact@2 + inputs: + buildType: current + artifactName: ${{ coalesce(parameters.artifacts.download.name, 'Artifacts_$(Agent.OS)_$(_BuildConfig)') }} + targetPath: ${{ coalesce(parameters.artifacts.download.path, 'artifacts') }} + itemPattern: ${{ coalesce(parameters.artifacts.download.pattern, '**') }} + + - ${{ each step in parameters.steps }}: + - ${{ step }} + + - ${{ if eq(parameters.enableRichCodeNavigation, true) }}: + - task: RichCodeNavIndexer@0 + displayName: RichCodeNav Upload + inputs: + languages: ${{ coalesce(parameters.richCodeNavigationLanguage, 'csharp') }} + environment: ${{ coalesce(parameters.richCodeNavigationEnvironment, 'internal') }} + richNavLogOutputDirectory: $(Build.SourcesDirectory)/artifacts/bin + uploadRichNavArtifacts: ${{ coalesce(parameters.richCodeNavigationUploadArtifacts, false) }} + continueOnError: true + + - template: /eng/common/core-templates/steps/component-governance.yml + parameters: + is1ESPipeline: ${{ parameters.is1ESPipeline }} + ${{ if eq(parameters.disableComponentGovernance, '') }}: + ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.runAsPublic, 'false'), or(startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/dotnet/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/microsoft/'), eq(variables['Build.SourceBranch'], 'refs/heads/main'))) }}: + disableComponentGovernance: false + ${{ else }}: + disableComponentGovernance: true + ${{ else }}: + disableComponentGovernance: ${{ parameters.disableComponentGovernance }} + componentGovernanceIgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }} + + - ${{ if eq(parameters.enableMicrobuild, 'true') }}: + - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - task: MicroBuildCleanup@1 + displayName: Execute Microbuild cleanup tasks + condition: and(always(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT')) + continueOnError: ${{ parameters.continueOnError }} + env: + TeamName: $(_TeamName) + - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.enableSbom, 'true')) }}: + - template: /eng/common/core-templates/steps/generate-sbom.yml + parameters: + is1ESPipeline: ${{ parameters.is1ESPipeline }} + PackageVersion: ${{ parameters.packageVersion}} + BuildDropPath: ${{ parameters.buildDropPath }} + IgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }} + publishArtifacts: false + + # Publish test results + - ${{ if and(eq(parameters.enablePublishTestResults, 'true'), eq(parameters.testResultsFormat, '')) }}: + - ${{ if eq(parameters.testResultsFormat, 'xunit') }}: + - task: PublishTestResults@2 + displayName: Publish XUnit Test Results + inputs: + testResultsFormat: 'xUnit' + testResultsFiles: '*.xml' + searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)' + testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-xunit + mergeTestResults: ${{ parameters.mergeTestResults }} + continueOnError: true + condition: always() + - ${{ if eq(parameters.testResultsFormat, 'vstest') }}: + - task: PublishTestResults@2 + displayName: Publish TRX Test Results + inputs: + testResultsFormat: 'VSTest' + testResultsFiles: '*.trx' + searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)' + testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-trx + mergeTestResults: ${{ parameters.mergeTestResults }} + continueOnError: true + condition: always() + + # gather artifacts + - ${{ if ne(parameters.artifacts.publish, '') }}: + - ${{ if and(ne(parameters.artifacts.publish.artifacts, 'false'), ne(parameters.artifacts.publish.artifacts, '')) }}: + - task: CopyFiles@2 + displayName: Gather binaries for publish to artifacts + inputs: + SourceFolder: 'artifacts/bin' + Contents: '**' + TargetFolder: '$(Build.ArtifactStagingDirectory)/artifacts/bin' + - task: CopyFiles@2 + displayName: Gather packages for publish to artifacts + inputs: + SourceFolder: 'artifacts/packages' + Contents: '**' + TargetFolder: '$(Build.ArtifactStagingDirectory)/artifacts/packages' + - ${{ if and(ne(parameters.artifacts.publish.logs, 'false'), ne(parameters.artifacts.publish.logs, '')) }}: + - task: CopyFiles@2 + displayName: Gather logs for publish to artifacts + inputs: + SourceFolder: 'artifacts/log' + Contents: '**' + TargetFolder: '$(Build.ArtifactStagingDirectory)/artifacts/log' + + - ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}: + - task: CopyFiles@2 + displayName: Gather logs for publish to artifacts + inputs: + SourceFolder: 'artifacts/log/$(_BuildConfig)' + Contents: '**' + TargetFolder: '$(Build.ArtifactStagingDirectory)/artifacts/log/$(_BuildConfig)' + - ${{ if eq(parameters.enableBuildRetry, 'true') }}: + - task: CopyFiles@2 + displayName: Gather buildconfiguration for build retry + inputs: + SourceFolder: '$(Build.SourcesDirectory)/eng/common/BuildConfiguration' + Contents: '**' + TargetFolder: '$(Build.ArtifactStagingDirectory)/eng/common/BuildConfiguration' + + - ${{ each step in parameters.artifactPublishSteps }}: + - ${{ step }} diff --git a/eng/common/core-templates/job/onelocbuild.yml b/eng/common/core-templates/job/onelocbuild.yml new file mode 100644 index 00000000000..00feec8ebbc --- /dev/null +++ b/eng/common/core-templates/job/onelocbuild.yml @@ -0,0 +1,121 @@ +parameters: + # Optional: dependencies of the job + dependsOn: '' + + # Optional: A defined YAML pool - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#pool + pool: '' + + CeapexPat: $(dn-bot-ceapex-package-r) # PAT for the loc AzDO instance https://dev.azure.com/ceapex + GithubPat: $(BotAccount-dotnet-bot-repo-PAT) + + SourcesDirectory: $(Build.SourcesDirectory) + CreatePr: true + AutoCompletePr: false + ReusePr: true + UseLfLineEndings: true + UseCheckedInLocProjectJson: false + SkipLocProjectJsonGeneration: false + LanguageSet: VS_Main_Languages + LclSource: lclFilesInRepo + LclPackageId: '' + RepoType: gitHub + GitHubOrg: dotnet + MirrorRepo: '' + MirrorBranch: main + condition: '' + JobNameSuffix: '' + is1ESPipeline: '' +jobs: +- job: OneLocBuild${{ parameters.JobNameSuffix }} + + dependsOn: ${{ parameters.dependsOn }} + + displayName: OneLocBuild${{ parameters.JobNameSuffix }} + + variables: + - group: OneLocBuildVariables # Contains the CeapexPat and GithubPat + - name: _GenerateLocProjectArguments + value: -SourcesDirectory ${{ parameters.SourcesDirectory }} + -LanguageSet "${{ parameters.LanguageSet }}" + -CreateNeutralXlfs + - ${{ if eq(parameters.UseCheckedInLocProjectJson, 'true') }}: + - name: _GenerateLocProjectArguments + value: ${{ variables._GenerateLocProjectArguments }} -UseCheckedInLocProjectJson + - template: /eng/common/core-templates/variables/pool-providers.yml + parameters: + is1ESPipeline: ${{ parameters.is1ESPipeline }} + + ${{ if ne(parameters.pool, '') }}: + pool: ${{ parameters.pool }} + ${{ if eq(parameters.pool, '') }}: + pool: + # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) + ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: + name: AzurePipelines-EO + image: 1ESPT-Windows2022 + demands: Cmd + os: windows + # If it's not devdiv, it's dnceng + ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: + name: $(DncEngInternalBuildPool) + image: 1es-windows-2022 + os: windows + + steps: + - ${{ if eq(parameters.is1ESPipeline, '') }}: + - 'Illegal entry point, is1ESPipeline is not defined. Repository yaml should not directly reference templates in core-templates folder.': error + + - ${{ if ne(parameters.SkipLocProjectJsonGeneration, 'true') }}: + - task: Powershell@2 + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/generate-locproject.ps1 + arguments: $(_GenerateLocProjectArguments) + displayName: Generate LocProject.json + condition: ${{ parameters.condition }} + + - task: OneLocBuild@2 + displayName: OneLocBuild + env: + SYSTEM_ACCESSTOKEN: $(System.AccessToken) + inputs: + locProj: eng/Localize/LocProject.json + outDir: $(Build.ArtifactStagingDirectory) + lclSource: ${{ parameters.LclSource }} + lclPackageId: ${{ parameters.LclPackageId }} + isCreatePrSelected: ${{ parameters.CreatePr }} + isAutoCompletePrSelected: ${{ parameters.AutoCompletePr }} + ${{ if eq(parameters.CreatePr, true) }}: + isUseLfLineEndingsSelected: ${{ parameters.UseLfLineEndings }} + ${{ if eq(parameters.RepoType, 'gitHub') }}: + isShouldReusePrSelected: ${{ parameters.ReusePr }} + packageSourceAuth: patAuth + patVariable: ${{ parameters.CeapexPat }} + ${{ if eq(parameters.RepoType, 'gitHub') }}: + repoType: ${{ parameters.RepoType }} + gitHubPatVariable: "${{ parameters.GithubPat }}" + ${{ if ne(parameters.MirrorRepo, '') }}: + isMirrorRepoSelected: true + gitHubOrganization: ${{ parameters.GitHubOrg }} + mirrorRepo: ${{ parameters.MirrorRepo }} + mirrorBranch: ${{ parameters.MirrorBranch }} + condition: ${{ parameters.condition }} + + - template: /eng/common/core-templates/steps/publish-build-artifacts.yml + parameters: + is1ESPipeline: ${{ parameters.is1ESPipeline }} + args: + displayName: Publish Localization Files + pathToPublish: '$(Build.ArtifactStagingDirectory)/loc' + publishLocation: Container + artifactName: Loc + condition: ${{ parameters.condition }} + + - template: /eng/common/core-templates/steps/publish-build-artifacts.yml + parameters: + is1ESPipeline: ${{ parameters.is1ESPipeline }} + args: + displayName: Publish LocProject.json + pathToPublish: '$(Build.SourcesDirectory)/eng/Localize/' + publishLocation: Container + artifactName: Loc + condition: ${{ parameters.condition }} \ No newline at end of file diff --git a/eng/common/core-templates/job/publish-build-assets.yml b/eng/common/core-templates/job/publish-build-assets.yml new file mode 100644 index 00000000000..8fe9299542c --- /dev/null +++ b/eng/common/core-templates/job/publish-build-assets.yml @@ -0,0 +1,172 @@ +parameters: + configuration: 'Debug' + + # Optional: condition for the job to run + condition: '' + + # Optional: 'true' if future jobs should run even if this job fails + continueOnError: false + + # Optional: dependencies of the job + dependsOn: '' + + # Optional: Include PublishBuildArtifacts task + enablePublishBuildArtifacts: false + + # Optional: A defined YAML pool - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#pool + pool: {} + + # Optional: should run as a public build even in the internal project + # if 'true', the build won't run any of the internal only steps, even if it is running in non-public projects. + runAsPublic: false + + # Optional: whether the build's artifacts will be published using release pipelines or direct feed publishing + publishUsingPipelines: false + + # Optional: whether the build's artifacts will be published using release pipelines or direct feed publishing + publishAssetsImmediately: false + + artifactsPublishingAdditionalParameters: '' + + signingValidationAdditionalParameters: '' + + is1ESPipeline: '' + +jobs: +- job: Asset_Registry_Publish + + dependsOn: ${{ parameters.dependsOn }} + timeoutInMinutes: 150 + + ${{ if eq(parameters.publishAssetsImmediately, 'true') }}: + displayName: Publish Assets + ${{ else }}: + displayName: Publish to Build Asset Registry + + variables: + - template: /eng/common/core-templates/variables/pool-providers.yml + parameters: + is1ESPipeline: ${{ parameters.is1ESPipeline }} + - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - group: Publish-Build-Assets + - group: AzureDevOps-Artifact-Feeds-Pats + - name: runCodesignValidationInjection + value: false + # unconditional - needed for logs publishing (redactor tool version) + - template: /eng/common/core-templates/post-build/common-variables.yml + + pool: + # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) + ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: + name: AzurePipelines-EO + image: 1ESPT-Windows2022 + demands: Cmd + os: windows + # If it's not devdiv, it's dnceng + ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: + name: NetCore1ESPool-Publishing-Internal + image: windows.vs2019.amd64 + os: windows + steps: + - ${{ if eq(parameters.is1ESPipeline, '') }}: + - 'Illegal entry point, is1ESPipeline is not defined. Repository yaml should not directly reference templates in core-templates folder.': error + + - ${{ 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: + artifactName: AssetManifests + downloadPath: '$(Build.StagingDirectory)/Download' + checkDownloadedFiles: true + condition: ${{ parameters.condition }} + continueOnError: ${{ parameters.continueOnError }} + + - task: NuGetAuthenticate@1 + + - task: PowerShell@2 + displayName: Publish Build Assets + inputs: + filePath: eng\common\sdk-task.ps1 + arguments: -task PublishBuildAssets -restore -msbuildEngine dotnet + /p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests' + /p:BuildAssetRegistryToken=$(MaestroAccessToken) + /p:MaestroApiEndpoint=https://maestro.dot.net + /p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }} + /p:OfficialBuildId=$(Build.BuildNumber) + condition: ${{ parameters.condition }} + continueOnError: ${{ parameters.continueOnError }} + + - task: powershell@2 + displayName: Create ReleaseConfigs Artifact + inputs: + targetType: inline + script: | + New-Item -Path "$(Build.StagingDirectory)/ReleaseConfigs" -ItemType Directory -Force + $filePath = "$(Build.StagingDirectory)/ReleaseConfigs/ReleaseConfigs.txt" + Add-Content -Path $filePath -Value $(BARBuildId) + Add-Content -Path $filePath -Value "$(DefaultChannels)" + Add-Content -Path $filePath -Value $(IsStableBuild) + + - template: /eng/common/core-templates/steps/publish-build-artifacts.yml + parameters: + is1ESPipeline: ${{ parameters.is1ESPipeline }} + args: + displayName: Publish ReleaseConfigs Artifact + pathToPublish: '$(Build.StagingDirectory)/ReleaseConfigs' + publishLocation: Container + artifactName: ReleaseConfigs + + - task: powershell@2 + displayName: Check if SymbolPublishingExclusionsFile.txt exists + inputs: + targetType: inline + script: | + $symbolExclusionfile = "$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt" + if(Test-Path -Path $symbolExclusionfile) + { + Write-Host "SymbolExclusionFile exists" + Write-Host "##vso[task.setvariable variable=SymbolExclusionFile]true" + } + else{ + Write-Host "Symbols Exclusion file does not exist" + Write-Host "##vso[task.setvariable variable=SymbolExclusionFile]false" + } + + - template: /eng/common/core-templates/steps/publish-build-artifacts.yml + parameters: + is1ESPipeline: ${{ parameters.is1ESPipeline }} + args: + displayName: Publish SymbolPublishingExclusionsFile Artifact + condition: eq(variables['SymbolExclusionFile'], 'true') + pathToPublish: '$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' + publishLocation: Container + artifactName: ReleaseConfigs + + - ${{ if eq(parameters.publishAssetsImmediately, 'true') }}: + - template: /eng/common/core-templates/post-build/setup-maestro-vars.yml + parameters: + BARBuildId: ${{ parameters.BARBuildId }} + PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} + is1ESPipeline: ${{ parameters.is1ESPipeline }} + + - task: PowerShell@2 + displayName: Publish Using Darc + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 + arguments: -BuildId $(BARBuildId) + -PublishingInfraVersion 3 + -AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)' + -MaestroToken '$(MaestroApiAccessToken)' + -WaitPublishingFinish true + -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' + -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' + + - ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}: + - template: /eng/common/core-templates/steps/publish-logs.yml + parameters: + is1ESPipeline: ${{ parameters.is1ESPipeline }} + JobLabel: 'Publish_Artifacts_Logs' diff --git a/eng/common/core-templates/job/source-build.yml b/eng/common/core-templates/job/source-build.yml new file mode 100644 index 00000000000..c0ce4b3c861 --- /dev/null +++ b/eng/common/core-templates/job/source-build.yml @@ -0,0 +1,80 @@ +parameters: + # This template adds arcade-powered source-build to CI. The template produces a server job with a + # default ID 'Source_Build_Complete' to put in a dependency list if necessary. + + # Specifies the prefix for source-build jobs added to pipeline. Use this if disambiguation needed. + jobNamePrefix: 'Source_Build' + + # Defines the platform on which to run the job. By default, a linux-x64 machine, suitable for + # managed-only repositories. This is an object with these properties: + # + # name: '' + # The name of the job. This is included in the job ID. + # targetRID: '' + # The name of the target RID to use, instead of the one auto-detected by Arcade. + # nonPortable: false + # Enables non-portable mode. This means a more specific RID (e.g. fedora.32-x64 rather than + # linux-x64), and compiling against distro-provided packages rather than portable ones. + # skipPublishValidation: false + # Disables publishing validation. By default, a check is performed to ensure no packages are + # published by source-build. + # container: '' + # A container to use. Runs in docker. + # pool: {} + # A pool to use. Runs directly on an agent. + # buildScript: '' + # Specifies the build script to invoke to perform the build in the repo. The default + # './build.sh' should work for typical Arcade repositories, but this is customizable for + # difficult situations. + # jobProperties: {} + # A list of job properties to inject at the top level, for potential extensibility beyond + # container and pool. + platform: {} + + is1ESPipeline: '' + +jobs: +- job: ${{ parameters.jobNamePrefix }}_${{ parameters.platform.name }} + displayName: Source-Build (${{ parameters.platform.name }}) + + ${{ each property in parameters.platform.jobProperties }}: + ${{ property.key }}: ${{ property.value }} + + ${{ if ne(parameters.platform.container, '') }}: + container: ${{ parameters.platform.container }} + + ${{ if eq(parameters.platform.pool, '') }}: + # The default VM host AzDO pool. This should be capable of running Docker containers: almost all + # source-build builds run in Docker, including the default managed platform. + # /eng/common/core-templates/variables/pool-providers.yml can't be used here (some customers declare variables already), so duplicate its logic + ${{ if eq(parameters.is1ESPipeline, 'true') }}: + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore-Svc-Public' ), False, 'NetCore-Public')] + demands: ImageOverride -equals build.ubuntu.2004.amd64 + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')] + image: 1es-mariner-2 + os: linux + ${{ else }}: + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore-Svc-Public' ), False, 'NetCore-Public')] + demands: ImageOverride -equals Build.Ubuntu.2204.Amd64.Open + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')] + demands: ImageOverride -equals Build.Ubuntu.2204.Amd64 + ${{ if ne(parameters.platform.pool, '') }}: + pool: ${{ parameters.platform.pool }} + + workspace: + clean: all + + steps: + - ${{ if eq(parameters.is1ESPipeline, '') }}: + - 'Illegal entry point, is1ESPipeline is not defined. Repository yaml should not directly reference templates in core-templates folder.': error + + - template: /eng/common/core-templates/steps/source-build.yml + parameters: + is1ESPipeline: ${{ parameters.is1ESPipeline }} + platform: ${{ parameters.platform }} diff --git a/eng/common/core-templates/job/source-index-stage1.yml b/eng/common/core-templates/job/source-index-stage1.yml new file mode 100644 index 00000000000..9c6e5ae3c3e --- /dev/null +++ b/eng/common/core-templates/job/source-index-stage1.yml @@ -0,0 +1,73 @@ +parameters: + runAsPublic: false + sourceIndexPackageVersion: 1.0.1-20240129.2 + 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: [] + binlogPath: artifacts/log/Debug/Build.binlog + condition: '' + dependsOn: '' + pool: '' + is1ESPipeline: '' + +jobs: +- job: SourceIndexStage1 + dependsOn: ${{ parameters.dependsOn }} + condition: ${{ parameters.condition }} + variables: + - name: SourceIndexPackageVersion + value: ${{ parameters.sourceIndexPackageVersion }} + - name: SourceIndexPackageSource + value: ${{ parameters.sourceIndexPackageSource }} + - name: BinlogPath + value: ${{ parameters.binlogPath }} + - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - group: source-dot-net stage1 variables + - template: /eng/common/core-templates/variables/pool-providers.yml + parameters: + is1ESPipeline: ${{ parameters.is1ESPipeline }} + + ${{ if ne(parameters.pool, '') }}: + pool: ${{ parameters.pool }} + ${{ if eq(parameters.pool, '') }}: + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: $(DncEngPublicBuildPool) + image: windows.vs2022.amd64.open + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: $(DncEngInternalBuildPool) + image: windows.vs2022.amd64 + + steps: + - ${{ if eq(parameters.is1ESPipeline, '') }}: + - 'Illegal entry point, is1ESPipeline is not defined. Repository yaml should not directly reference templates in core-templates folder.': error + + - ${{ each preStep in parameters.preSteps }}: + - ${{ preStep }} + + - task: UseDotNet@2 + displayName: Use .NET 8 SDK + inputs: + packageType: sdk + version: 8.0.x + installationPath: $(Agent.TempDirectory)/dotnet + workingDirectory: $(Agent.TempDirectory) + + - script: | + $(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version $(SourceIndexPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools + $(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version $(SourceIndexPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools + displayName: Download Tools + # Set working directory to temp directory so 'dotnet' doesn't try to use global.json and use the repo's sdk. + workingDirectory: $(Agent.TempDirectory) + + - script: ${{ parameters.sourceIndexBuildCommand }} + displayName: Build Repository + + - script: $(Agent.TempDirectory)/.source-index/tools/BinLogToSln -i $(BinlogPath) -r $(Build.SourcesDirectory) -n $(Build.Repository.Name) -o .source-index/stage1output + displayName: Process Binlog into indexable sln + + - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - script: $(Agent.TempDirectory)/.source-index/tools/UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name) + displayName: Upload stage1 artifacts to source index + env: + BLOB_CONTAINER_URL: $(source-dot-net-stage1-blob-container-url) diff --git a/eng/common/core-templates/jobs/codeql-build.yml b/eng/common/core-templates/jobs/codeql-build.yml new file mode 100644 index 00000000000..f2144252cc6 --- /dev/null +++ b/eng/common/core-templates/jobs/codeql-build.yml @@ -0,0 +1,33 @@ +parameters: + # See schema documentation in /Documentation/AzureDevOps/TemplateSchema.md + continueOnError: false + # Required: A collection of jobs to run - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#job + jobs: [] + # Optional: if specified, restore and use this version of Guardian instead of the default. + overrideGuardianVersion: '' + is1ESPipeline: '' + +jobs: +- template: /eng/common/core-templates/jobs/jobs.yml + parameters: + is1ESPipeline: ${{ parameters.is1ESPipeline }} + enableMicrobuild: false + enablePublishBuildArtifacts: false + enablePublishTestResults: false + enablePublishBuildAssets: false + enablePublishUsingPipelines: false + enableTelemetry: true + + variables: + - group: Publish-Build-Assets + # The Guardian version specified in 'eng/common/sdl/packages.config'. This value must be kept in + # sync with the packages.config file. + - name: DefaultGuardianVersion + value: 0.109.0 + - name: GuardianPackagesConfigFile + value: $(Build.SourcesDirectory)\eng\common\sdl\packages.config + - name: GuardianVersion + value: ${{ coalesce(parameters.overrideGuardianVersion, '$(DefaultGuardianVersion)') }} + + jobs: ${{ parameters.jobs }} + diff --git a/eng/common/core-templates/jobs/jobs.yml b/eng/common/core-templates/jobs/jobs.yml new file mode 100644 index 00000000000..ea69be4341c --- /dev/null +++ b/eng/common/core-templates/jobs/jobs.yml @@ -0,0 +1,119 @@ +parameters: + # See schema documentation in /Documentation/AzureDevOps/TemplateSchema.md + continueOnError: false + + # Optional: Include PublishBuildArtifacts task + enablePublishBuildArtifacts: false + + # Optional: Enable publishing using release pipelines + enablePublishUsingPipelines: false + + # Optional: Enable running the source-build jobs to build repo from source + enableSourceBuild: false + + # Optional: Parameters for source-build template. + # See /eng/common/core-templates/jobs/source-build.yml for options + sourceBuildParameters: [] + + graphFileGeneration: + # Optional: Enable generating the graph files at the end of the build + enabled: false + # Optional: Include toolset dependencies in the generated graph files + includeToolset: false + + # Required: A collection of jobs to run - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#job + jobs: [] + + # Optional: Override automatically derived dependsOn value for "publish build assets" job + publishBuildAssetsDependsOn: '' + + # Optional: Publish the assets as soon as the publish to BAR stage is complete, rather doing so in a separate stage. + publishAssetsImmediately: false + + # Optional: If using publishAssetsImmediately and additional parameters are needed, can be used to send along additional parameters (normally sent to post-build.yml) + artifactsPublishingAdditionalParameters: '' + signingValidationAdditionalParameters: '' + + # Optional: should run as a public build even in the internal project + # if 'true', the build won't run any of the internal only steps, even if it is running in non-public projects. + runAsPublic: false + + enableSourceIndex: false + sourceIndexParams: {} + + artifacts: {} + is1ESPipeline: '' + +# Internal resources (telemetry, microbuild) can only be accessed from non-public projects, +# and some (Microbuild) should only be applied to non-PR cases for internal builds. + +jobs: +- ${{ each job in parameters.jobs }}: + - ${{ if eq(parameters.is1ESPipeline, 'true') }}: + - template: /eng/common/templates-official/job/job.yml + parameters: + # pass along parameters + ${{ each parameter in parameters }}: + ${{ if ne(parameter.key, 'jobs') }}: + ${{ parameter.key }}: ${{ parameter.value }} + + # pass along job properties + ${{ each property in job }}: + ${{ if ne(property.key, 'job') }}: + ${{ property.key }}: ${{ property.value }} + + name: ${{ job.job }} + + - ${{ else }}: + - template: /eng/common/templates/job/job.yml + parameters: + # pass along parameters + ${{ each parameter in parameters }}: + ${{ if ne(parameter.key, 'jobs') }}: + ${{ parameter.key }}: ${{ parameter.value }} + + # pass along job properties + ${{ each property in job }}: + ${{ if ne(property.key, 'job') }}: + ${{ property.key }}: ${{ property.value }} + + name: ${{ job.job }} + +- ${{ if eq(parameters.enableSourceBuild, true) }}: + - template: /eng/common/core-templates/jobs/source-build.yml + parameters: + is1ESPipeline: ${{ parameters.is1ESPipeline }} + allCompletedJobId: Source_Build_Complete + ${{ each parameter in parameters.sourceBuildParameters }}: + ${{ parameter.key }}: ${{ parameter.value }} + +- ${{ if eq(parameters.enableSourceIndex, 'true') }}: + - template: ../job/source-index-stage1.yml + parameters: + is1ESPipeline: ${{ parameters.is1ESPipeline }} + runAsPublic: ${{ parameters.runAsPublic }} + ${{ each parameter in parameters.sourceIndexParams }}: + ${{ parameter.key }}: ${{ parameter.value }} + +- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - ${{ if or(eq(parameters.enablePublishBuildAssets, true), eq(parameters.artifacts.publish.manifests, 'true'), ne(parameters.artifacts.publish.manifests, '')) }}: + - template: ../job/publish-build-assets.yml + parameters: + is1ESPipeline: ${{ parameters.is1ESPipeline }} + continueOnError: ${{ parameters.continueOnError }} + dependsOn: + - ${{ if ne(parameters.publishBuildAssetsDependsOn, '') }}: + - ${{ each job in parameters.publishBuildAssetsDependsOn }}: + - ${{ job.job }} + - ${{ if eq(parameters.publishBuildAssetsDependsOn, '') }}: + - ${{ each job in parameters.jobs }}: + - ${{ job.job }} + - ${{ if eq(parameters.enableSourceBuild, true) }}: + - Source_Build_Complete + + runAsPublic: ${{ parameters.runAsPublic }} + publishUsingPipelines: ${{ parameters.enablePublishUsingPipelines }} + publishAssetsImmediately: ${{ parameters.publishAssetsImmediately }} + enablePublishBuildArtifacts: ${{ parameters.enablePublishBuildArtifacts }} + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + signingValidationAdditionalParameters: ${{ parameters.signingValidationAdditionalParameters }} diff --git a/eng/common/core-templates/jobs/source-build.yml b/eng/common/core-templates/jobs/source-build.yml new file mode 100644 index 00000000000..d8e5d008522 --- /dev/null +++ b/eng/common/core-templates/jobs/source-build.yml @@ -0,0 +1,50 @@ +parameters: + # This template adds arcade-powered source-build to CI. A job is created for each platform, as + # well as an optional server job that completes when all platform jobs complete. + + # The name of the "join" job for all source-build platforms. If set to empty string, the job is + # not included. Existing repo pipelines can use this job depend on all source-build jobs + # completing without maintaining a separate list of every single job ID: just depend on this one + # server job. By default, not included. Recommended name if used: 'Source_Build_Complete'. + allCompletedJobId: '' + + # See /eng/common/core-templates/job/source-build.yml + jobNamePrefix: 'Source_Build' + + # This is the default platform provided by Arcade, intended for use by a managed-only repo. + defaultManagedPlatform: + name: 'Managed' + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9' + + # Defines the platforms on which to run build jobs. One job is created for each platform, and the + # object in this array is sent to the job template as 'platform'. If no platforms are specified, + # one job runs on 'defaultManagedPlatform'. + platforms: [] + + is1ESPipeline: '' + +jobs: + +- ${{ if ne(parameters.allCompletedJobId, '') }}: + - job: ${{ parameters.allCompletedJobId }} + displayName: Source-Build Complete + pool: server + dependsOn: + - ${{ each platform in parameters.platforms }}: + - ${{ parameters.jobNamePrefix }}_${{ platform.name }} + - ${{ if eq(length(parameters.platforms), 0) }}: + - ${{ parameters.jobNamePrefix }}_${{ parameters.defaultManagedPlatform.name }} + +- ${{ each platform in parameters.platforms }}: + - template: /eng/common/core-templates/job/source-build.yml + parameters: + is1ESPipeline: ${{ parameters.is1ESPipeline }} + jobNamePrefix: ${{ parameters.jobNamePrefix }} + platform: ${{ platform }} + +- ${{ if eq(length(parameters.platforms), 0) }}: + - template: /eng/common/core-templates/job/source-build.yml + parameters: + is1ESPipeline: ${{ parameters.is1ESPipeline }} + jobNamePrefix: ${{ parameters.jobNamePrefix }} + platform: ${{ parameters.defaultManagedPlatform }} diff --git a/eng/common/core-templates/post-build/common-variables.yml b/eng/common/core-templates/post-build/common-variables.yml new file mode 100644 index 00000000000..b9ede10bf09 --- /dev/null +++ b/eng/common/core-templates/post-build/common-variables.yml @@ -0,0 +1,24 @@ +variables: + - group: Publish-Build-Assets + + # Whether the build is internal or not + - name: IsInternalBuild + value: ${{ and(ne(variables['System.TeamProject'], 'public'), contains(variables['Build.SourceBranch'], 'internal')) }} + + # Default Maestro++ API Endpoint and API Version + - name: MaestroApiEndPoint + value: "https://maestro.dot.net" + - name: MaestroApiAccessToken + value: $(MaestroAccessToken) + - name: MaestroApiVersion + value: "2020-02-20" + + - name: SourceLinkCLIVersion + value: 3.0.0 + - name: SymbolToolVersion + value: 1.0.1 + - name: BinlogToolVersion + value: 1.0.11 + + - name: runCodesignValidationInjection + value: false diff --git a/eng/common/core-templates/post-build/post-build.yml b/eng/common/core-templates/post-build/post-build.yml new file mode 100644 index 00000000000..ed1e6692f73 --- /dev/null +++ b/eng/common/core-templates/post-build/post-build.yml @@ -0,0 +1,298 @@ +parameters: + # Which publishing infra should be used. THIS SHOULD MATCH THE VERSION ON THE BUILD MANIFEST. + # Publishing V1 is no longer supported + # Publishing V2 is no longer supported + # Publishing V3 is the default + - name: publishingInfraVersion + displayName: Which version of publishing should be used to promote the build definition? + type: number + default: 3 + values: + - 3 + + - name: BARBuildId + displayName: BAR Build Id + type: number + default: 0 + + - name: PromoteToChannelIds + displayName: Channel to promote BARBuildId to + type: string + default: '' + + - name: enableSourceLinkValidation + displayName: Enable SourceLink validation + type: boolean + default: false + + - name: enableSigningValidation + displayName: Enable signing validation + type: boolean + default: true + + - name: enableSymbolValidation + displayName: Enable symbol validation + type: boolean + default: false + + - name: enableNugetValidation + displayName: Enable NuGet validation + type: boolean + default: true + + - name: publishInstallersAndChecksums + displayName: Publish installers and checksums + type: boolean + default: true + + - name: SDLValidationParameters + type: object + default: + enable: false + publishGdn: false + continueOnError: false + params: '' + artifactNames: '' + downloadArtifacts: true + + # These parameters let the user customize the call to sdk-task.ps1 for publishing + # symbols & general artifacts as well as for signing validation + - name: symbolPublishingAdditionalParameters + displayName: Symbol publishing additional parameters + type: string + default: '' + + - name: artifactsPublishingAdditionalParameters + displayName: Artifact publishing additional parameters + type: string + default: '' + + - name: signingValidationAdditionalParameters + displayName: Signing validation additional parameters + type: string + default: '' + + # Which stages should finish execution before post-build stages start + - name: validateDependsOn + type: object + default: + - build + + - name: publishDependsOn + type: object + default: + - Validate + + # Optional: Call asset publishing rather than running in a separate stage + - name: publishAssetsImmediately + type: boolean + default: false + + - name: is1ESPipeline + type: boolean + default: false + +stages: +- ${{ if or(eq( parameters.enableNugetValidation, 'true'), eq(parameters.enableSigningValidation, 'true'), eq(parameters.enableSourceLinkValidation, 'true'), eq(parameters.SDLValidationParameters.enable, 'true')) }}: + - stage: Validate + dependsOn: ${{ parameters.validateDependsOn }} + displayName: Validate Build Assets + variables: + - template: /eng/common/core-templates/post-build/common-variables.yml + - template: /eng/common/core-templates/variables/pool-providers.yml + parameters: + is1ESPipeline: ${{ parameters.is1ESPipeline }} + jobs: + - job: + displayName: NuGet Validation + condition: and(succeededOrFailed(), eq( ${{ parameters.enableNugetValidation }}, 'true')) + pool: + # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) + ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: + name: AzurePipelines-EO + image: 1ESPT-Windows2022 + demands: Cmd + os: windows + # If it's not devdiv, it's dnceng + ${{ else }}: + name: $(DncEngInternalBuildPool) + image: 1es-windows-2022 + os: windows + + steps: + - template: /eng/common/core-templates/post-build/setup-maestro-vars.yml + parameters: + BARBuildId: ${{ parameters.BARBuildId }} + PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} + is1ESPipeline: ${{ parameters.is1ESPipeline }} + + - task: DownloadBuildArtifacts@0 + displayName: Download Package Artifacts + inputs: + buildType: specific + buildVersionToDownload: specific + project: $(AzDOProjectName) + pipeline: $(AzDOPipelineId) + buildId: $(AzDOBuildId) + artifactName: PackageArtifacts + checkDownloadedFiles: true + + - task: PowerShell@2 + displayName: Validate + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/post-build/nuget-validation.ps1 + arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ + -ToolDestinationPath $(Agent.BuildDirectory)/Extract/ + + - job: + displayName: Signing Validation + condition: and( eq( ${{ parameters.enableSigningValidation }}, 'true'), ne( variables['PostBuildSign'], 'true')) + pool: + # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) + ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: + name: AzurePipelines-EO + image: 1ESPT-Windows2022 + demands: Cmd + os: windows + # If it's not devdiv, it's dnceng + ${{ else }}: + name: $(DncEngInternalBuildPool) + image: 1es-windows-2022 + os: windows + steps: + - template: /eng/common/core-templates/post-build/setup-maestro-vars.yml + parameters: + BARBuildId: ${{ parameters.BARBuildId }} + PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} + is1ESPipeline: ${{ parameters.is1ESPipeline }} + + - task: DownloadBuildArtifacts@0 + displayName: Download Package Artifacts + inputs: + buildType: specific + buildVersionToDownload: specific + project: $(AzDOProjectName) + pipeline: $(AzDOPipelineId) + buildId: $(AzDOBuildId) + artifactName: PackageArtifacts + checkDownloadedFiles: true + itemPattern: | + ** + !**/Microsoft.SourceBuild.Intermediate.*.nupkg + + # 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@1 + displayName: 'Authenticate to AzDO Feeds' + + # Signing validation will optionally work with the buildmanifest file which is downloaded from + # Azure DevOps above. + - task: PowerShell@2 + displayName: Validate + inputs: + filePath: eng\common\sdk-task.ps1 + arguments: -task SigningValidation -restore -msbuildEngine vs + /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts' + /p:SignCheckExclusionsFile='$(Build.SourcesDirectory)/eng/SignCheckExclusionsFile.txt' + ${{ parameters.signingValidationAdditionalParameters }} + + - template: /eng/common/core-templates/steps/publish-logs.yml + parameters: + is1ESPipeline: ${{ parameters.is1ESPipeline }} + StageLabel: 'Validation' + JobLabel: 'Signing' + BinlogToolVersion: $(BinlogToolVersion) + + - job: + displayName: SourceLink Validation + condition: eq( ${{ parameters.enableSourceLinkValidation }}, 'true') + pool: + # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) + ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: + name: AzurePipelines-EO + image: 1ESPT-Windows2022 + demands: Cmd + os: windows + # If it's not devdiv, it's dnceng + ${{ else }}: + name: $(DncEngInternalBuildPool) + image: 1es-windows-2022 + os: windows + steps: + - template: /eng/common/core-templates/post-build/setup-maestro-vars.yml + parameters: + BARBuildId: ${{ parameters.BARBuildId }} + PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} + is1ESPipeline: ${{ parameters.is1ESPipeline }} + + - task: DownloadBuildArtifacts@0 + displayName: Download Blob Artifacts + inputs: + buildType: specific + buildVersionToDownload: specific + project: $(AzDOProjectName) + pipeline: $(AzDOPipelineId) + buildId: $(AzDOBuildId) + artifactName: BlobArtifacts + checkDownloadedFiles: true + + - task: PowerShell@2 + displayName: Validate + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/post-build/sourcelink-validation.ps1 + arguments: -InputPath $(Build.ArtifactStagingDirectory)/BlobArtifacts/ + -ExtractPath $(Agent.BuildDirectory)/Extract/ + -GHRepoName $(Build.Repository.Name) + -GHCommit $(Build.SourceVersion) + -SourcelinkCliVersion $(SourceLinkCLIVersion) + continueOnError: true + +- ${{ if ne(parameters.publishAssetsImmediately, 'true') }}: + - stage: publish_using_darc + ${{ if or(eq(parameters.enableNugetValidation, 'true'), eq(parameters.enableSigningValidation, 'true'), eq(parameters.enableSourceLinkValidation, 'true'), eq(parameters.SDLValidationParameters.enable, 'true')) }}: + dependsOn: ${{ parameters.publishDependsOn }} + ${{ else }}: + dependsOn: ${{ parameters.validateDependsOn }} + displayName: Publish using Darc + variables: + - template: /eng/common/core-templates/post-build/common-variables.yml + - template: /eng/common/core-templates/variables/pool-providers.yml + parameters: + is1ESPipeline: ${{ parameters.is1ESPipeline }} + jobs: + - job: + displayName: Publish Using Darc + timeoutInMinutes: 120 + pool: + # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) + ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: + name: AzurePipelines-EO + image: 1ESPT-Windows2022 + demands: Cmd + os: windows + # If it's not devdiv, it's dnceng + ${{ else }}: + name: NetCore1ESPool-Publishing-Internal + image: windows.vs2019.amd64 + os: windows + steps: + - template: /eng/common/core-templates/post-build/setup-maestro-vars.yml + parameters: + BARBuildId: ${{ parameters.BARBuildId }} + PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} + is1ESPipeline: ${{ parameters.is1ESPipeline }} + + - task: NuGetAuthenticate@1 + + - task: PowerShell@2 + displayName: Publish Using Darc + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 + arguments: -BuildId $(BARBuildId) + -PublishingInfraVersion ${{ parameters.publishingInfraVersion }} + -AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)' + -MaestroToken '$(MaestroApiAccessToken)' + -WaitPublishingFinish true + -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' + -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' diff --git a/eng/common/core-templates/post-build/setup-maestro-vars.yml b/eng/common/core-templates/post-build/setup-maestro-vars.yml new file mode 100644 index 00000000000..8d56b572679 --- /dev/null +++ b/eng/common/core-templates/post-build/setup-maestro-vars.yml @@ -0,0 +1,74 @@ +parameters: + BARBuildId: '' + PromoteToChannelIds: '' + is1ESPipeline: '' + +steps: + - ${{ if eq(parameters.is1ESPipeline, '') }}: + - 'Illegal entry point, is1ESPipeline is not defined. Repository yaml should not directly reference templates in core-templates folder.': error + + - ${{ if eq(coalesce(parameters.PromoteToChannelIds, 0), 0) }}: + - task: DownloadBuildArtifacts@0 + displayName: Download Release Configs + inputs: + buildType: current + artifactName: ReleaseConfigs + checkDownloadedFiles: true + + - task: PowerShell@2 + name: setReleaseVars + displayName: Set Release Configs Vars + inputs: + targetType: inline + pwsh: true + script: | + try { + if (!$Env:PromoteToMaestroChannels -or $Env:PromoteToMaestroChannels.Trim() -eq '') { + $Content = Get-Content $(Build.StagingDirectory)/ReleaseConfigs/ReleaseConfigs.txt + + $BarId = $Content | Select -Index 0 + $Channels = $Content | Select -Index 1 + $IsStableBuild = $Content | Select -Index 2 + + $AzureDevOpsProject = $Env:System_TeamProject + $AzureDevOpsBuildDefinitionId = $Env:System_DefinitionId + $AzureDevOpsBuildId = $Env:Build_BuildId + } + else { + $buildApiEndpoint = "${Env:MaestroApiEndPoint}/api/builds/${Env:BARBuildId}?api-version=${Env:MaestroApiVersion}" + + $apiHeaders = New-Object 'System.Collections.Generic.Dictionary[[String],[String]]' + $apiHeaders.Add('Accept', 'application/json') + $apiHeaders.Add('Authorization',"Bearer ${Env:MAESTRO_API_TOKEN}") + + $buildInfo = try { Invoke-WebRequest -Method Get -Uri $buildApiEndpoint -Headers $apiHeaders | ConvertFrom-Json } catch { Write-Host "Error: $_" } + + $BarId = $Env:BARBuildId + $Channels = $Env:PromoteToMaestroChannels -split "," + $Channels = $Channels -join "][" + $Channels = "[$Channels]" + + $IsStableBuild = $buildInfo.stable + $AzureDevOpsProject = $buildInfo.azureDevOpsProject + $AzureDevOpsBuildDefinitionId = $buildInfo.azureDevOpsBuildDefinitionId + $AzureDevOpsBuildId = $buildInfo.azureDevOpsBuildId + } + + Write-Host "##vso[task.setvariable variable=BARBuildId]$BarId" + Write-Host "##vso[task.setvariable variable=TargetChannels]$Channels" + Write-Host "##vso[task.setvariable variable=IsStableBuild]$IsStableBuild" + + Write-Host "##vso[task.setvariable variable=AzDOProjectName]$AzureDevOpsProject" + Write-Host "##vso[task.setvariable variable=AzDOPipelineId]$AzureDevOpsBuildDefinitionId" + Write-Host "##vso[task.setvariable variable=AzDOBuildId]$AzureDevOpsBuildId" + } + catch { + Write-Host $_ + Write-Host $_.Exception + Write-Host $_.ScriptStackTrace + exit 1 + } + env: + MAESTRO_API_TOKEN: $(MaestroApiAccessToken) + BARBuildId: ${{ parameters.BARBuildId }} + PromoteToMaestroChannels: ${{ parameters.PromoteToChannelIds }} diff --git a/eng/common/core-templates/post-build/trigger-subscription.yml b/eng/common/core-templates/post-build/trigger-subscription.yml new file mode 100644 index 00000000000..da669030daf --- /dev/null +++ b/eng/common/core-templates/post-build/trigger-subscription.yml @@ -0,0 +1,13 @@ +parameters: + ChannelId: 0 + +steps: +- task: PowerShell@2 + displayName: Triggering subscriptions + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/post-build/trigger-subscriptions.ps1 + arguments: -SourceRepo $(Build.Repository.Uri) + -ChannelId ${{ parameters.ChannelId }} + -MaestroApiAccessToken $(MaestroAccessToken) + -MaestroApiEndPoint $(MaestroApiEndPoint) + -MaestroApiVersion $(MaestroApiVersion) diff --git a/eng/common/core-templates/steps/add-build-to-channel.yml b/eng/common/core-templates/steps/add-build-to-channel.yml new file mode 100644 index 00000000000..f67a210d62f --- /dev/null +++ b/eng/common/core-templates/steps/add-build-to-channel.yml @@ -0,0 +1,13 @@ +parameters: + ChannelId: 0 + +steps: +- task: PowerShell@2 + displayName: Add Build to Channel + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/post-build/add-build-to-channel.ps1 + arguments: -BuildId $(BARBuildId) + -ChannelId ${{ parameters.ChannelId }} + -MaestroApiAccessToken $(MaestroApiAccessToken) + -MaestroApiEndPoint $(MaestroApiEndPoint) + -MaestroApiVersion $(MaestroApiVersion) diff --git a/eng/common/core-templates/steps/component-governance.yml b/eng/common/core-templates/steps/component-governance.yml new file mode 100644 index 00000000000..df449a34c11 --- /dev/null +++ b/eng/common/core-templates/steps/component-governance.yml @@ -0,0 +1,14 @@ +parameters: + disableComponentGovernance: false + componentGovernanceIgnoreDirectories: '' + is1ESPipeline: false + +steps: +- ${{ if eq(parameters.disableComponentGovernance, 'true') }}: + - script: echo "##vso[task.setvariable variable=skipComponentGovernanceDetection]true" + displayName: Set skipComponentGovernanceDetection variable +- ${{ if ne(parameters.disableComponentGovernance, 'true') }}: + - task: ComponentGovernanceComponentDetection@0 + continueOnError: true + inputs: + ignoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }} \ No newline at end of file diff --git a/eng/common/core-templates/steps/generate-sbom.yml b/eng/common/core-templates/steps/generate-sbom.yml new file mode 100644 index 00000000000..d938b60e1bb --- /dev/null +++ b/eng/common/core-templates/steps/generate-sbom.yml @@ -0,0 +1,54 @@ +# BuildDropPath - The root folder of the drop directory for which the manifest file will be generated. +# PackageName - The name of the package this SBOM represents. +# PackageVersion - The version of the package this SBOM represents. +# ManifestDirPath - The path of the directory where the generated manifest files will be placed +# IgnoreDirectories - Directories to ignore for SBOM generation. This will be passed through to the CG component detector. + +parameters: + PackageVersion: 9.0.0 + BuildDropPath: '$(Build.SourcesDirectory)/artifacts' + PackageName: '.NET' + ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom + IgnoreDirectories: '' + sbomContinueOnError: true + is1ESPipeline: false + # disable publishArtifacts if some other step is publishing the artifacts (like job.yml). + publishArtifacts: true + +steps: +- task: PowerShell@2 + displayName: Prep for SBOM generation in (Non-linux) + condition: or(eq(variables['Agent.Os'], 'Windows_NT'), eq(variables['Agent.Os'], 'Darwin')) + inputs: + filePath: ./eng/common/generate-sbom-prep.ps1 + arguments: ${{parameters.manifestDirPath}} + +# Chmodding is a workaround for https://github.com/dotnet/arcade/issues/8461 +- script: | + chmod +x ./eng/common/generate-sbom-prep.sh + ./eng/common/generate-sbom-prep.sh ${{parameters.manifestDirPath}} + displayName: Prep for SBOM generation in (Linux) + condition: eq(variables['Agent.Os'], 'Linux') + continueOnError: ${{ parameters.sbomContinueOnError }} + +- task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0 + displayName: 'Generate SBOM manifest' + continueOnError: ${{ parameters.sbomContinueOnError }} + inputs: + PackageName: ${{ parameters.packageName }} + BuildDropPath: ${{ parameters.buildDropPath }} + PackageVersion: ${{ parameters.packageVersion }} + ManifestDirPath: ${{ parameters.manifestDirPath }} + ${{ if ne(parameters.IgnoreDirectories, '') }}: + AdditionalComponentDetectorArgs: '--IgnoreDirectories ${{ parameters.IgnoreDirectories }}' + +- ${{ if eq(parameters.publishArtifacts, 'true')}}: + - template: /eng/common/core-templates/steps/publish-pipeline-artifacts.yml + parameters: + is1ESPipeline: ${{ parameters.is1ESPipeline }} + args: + displayName: Publish SBOM manifest + continueOnError: ${{parameters.sbomContinueOnError}} + targetPath: '${{ parameters.manifestDirPath }}' + artifactName: $(ARTIFACT_NAME) + diff --git a/eng/common/core-templates/steps/publish-build-artifacts.yml b/eng/common/core-templates/steps/publish-build-artifacts.yml new file mode 100644 index 00000000000..f24ce346684 --- /dev/null +++ b/eng/common/core-templates/steps/publish-build-artifacts.yml @@ -0,0 +1,20 @@ +parameters: +- name: is1ESPipeline + type: boolean + default: false +- name: args + type: object + default: {} +steps: +- ${{ if ne(parameters.is1ESPipeline, true) }}: + - template: /eng/common/templates/steps/publish-build-artifacts.yml + parameters: + is1ESPipeline: ${{ parameters.is1ESPipeline }} + ${{ each parameter in parameters.args }}: + ${{ parameter.key }}: ${{ parameter.value }} +- ${{ else }}: + - template: /eng/common/templates-official/steps/publish-build-artifacts.yml + parameters: + is1ESPipeline: ${{ parameters.is1ESPipeline }} + ${{ each parameter in parameters.args }}: + ${{ parameter.key }}: ${{ parameter.value }} \ No newline at end of file diff --git a/eng/common/core-templates/steps/publish-logs.yml b/eng/common/core-templates/steps/publish-logs.yml new file mode 100644 index 00000000000..8c5ea77b586 --- /dev/null +++ b/eng/common/core-templates/steps/publish-logs.yml @@ -0,0 +1,59 @@ +parameters: + StageLabel: '' + JobLabel: '' + CustomSensitiveDataList: '' + # A default - in case value from eng/common/core-templates/post-build/common-variables.yml is not passed + BinlogToolVersion: '1.0.11' + is1ESPipeline: false + +steps: +- task: Powershell@2 + displayName: Prepare Binlogs to Upload + inputs: + targetType: inline + script: | + New-Item -ItemType Directory $(Build.SourcesDirectory)/PostBuildLogs/${{parameters.StageLabel}}/${{parameters.JobLabel}}/ + 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() + +- task: CopyFiles@2 + displayName: Gather post build logs + inputs: + SourceFolder: '$(Build.SourcesDirectory)/PostBuildLogs' + Contents: '**' + TargetFolder: '$(Build.ArtifactStagingDirectory)/PostBuildLogs' + +- template: /eng/common/core-templates/steps/publish-build-artifacts.yml + parameters: + is1ESPipeline: ${{ parameters.is1ESPipeline }} + args: + displayName: Publish Logs + pathToPublish: '$(Build.ArtifactStagingDirectory)/PostBuildLogs' + publishLocation: Container + artifactName: PostBuildLogs + continueOnError: true + condition: always() diff --git a/eng/common/core-templates/steps/publish-pipeline-artifacts.yml b/eng/common/core-templates/steps/publish-pipeline-artifacts.yml new file mode 100644 index 00000000000..2efec04dc2c --- /dev/null +++ b/eng/common/core-templates/steps/publish-pipeline-artifacts.yml @@ -0,0 +1,20 @@ +parameters: +- name: is1ESPipeline + type: boolean + default: false + +- name: args + type: object + default: {} + +steps: +- ${{ if ne(parameters.is1ESPipeline, true) }}: + - template: /eng/common/templates/steps/publish-pipeline-artifacts.yml + parameters: + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} +- ${{ else }}: + - template: /eng/common/templates-official/steps/publish-pipeline-artifacts.yml + parameters: + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/eng/common/core-templates/steps/retain-build.yml b/eng/common/core-templates/steps/retain-build.yml new file mode 100644 index 00000000000..83d97a26a01 --- /dev/null +++ b/eng/common/core-templates/steps/retain-build.yml @@ -0,0 +1,28 @@ +parameters: + # Optional azure devops PAT with build execute permissions for the build's organization, + # only needed if the build that should be retained ran on a different organization than + # the pipeline where this template is executing from + Token: '' + # Optional BuildId to retain, defaults to the current running build + BuildId: '' + # Azure devops Organization URI for the build in the https://dev.azure.com/ format. + # Defaults to the organization the current pipeline is running on + AzdoOrgUri: '$(System.CollectionUri)' + # Azure devops project for the build. Defaults to the project the current pipeline is running on + AzdoProject: '$(System.TeamProject)' + +steps: + - task: powershell@2 + inputs: + targetType: 'filePath' + filePath: eng/common/retain-build.ps1 + pwsh: true + arguments: > + -AzdoOrgUri: ${{parameters.AzdoOrgUri}} + -AzdoProject ${{parameters.AzdoProject}} + -Token ${{coalesce(parameters.Token, '$env:SYSTEM_ACCESSTOKEN') }} + -BuildId ${{coalesce(parameters.BuildId, '$env:BUILD_ID')}} + displayName: Enable permanent build retention + env: + SYSTEM_ACCESSTOKEN: $(System.AccessToken) + BUILD_ID: $(Build.BuildId) \ No newline at end of file diff --git a/eng/common/core-templates/steps/send-to-helix.yml b/eng/common/core-templates/steps/send-to-helix.yml new file mode 100644 index 00000000000..68fa739c4ab --- /dev/null +++ b/eng/common/core-templates/steps/send-to-helix.yml @@ -0,0 +1,93 @@ +# Please remember to update the documentation if you make changes to these parameters! +parameters: + HelixSource: 'pr/default' # required -- sources must start with pr/, official/, prodcon/, or agent/ + HelixType: 'tests/default/' # required -- Helix telemetry which identifies what type of data this is; should include "test" for clarity and must end in '/' + HelixBuild: $(Build.BuildNumber) # required -- the build number Helix will use to identify this -- automatically set to the AzDO build number + HelixTargetQueues: '' # required -- semicolon-delimited list of Helix queues to test on; see https://helix.dot.net/ for a list of queues + HelixAccessToken: '' # required -- access token to make Helix API requests; should be provided by the appropriate variable group + HelixProjectPath: 'eng/common/helixpublish.proj' # optional -- path to the project file to build relative to BUILD_SOURCESDIRECTORY + HelixProjectArguments: '' # optional -- arguments passed to the build command + HelixConfiguration: '' # optional -- additional property attached to a job + HelixPreCommands: '' # optional -- commands to run before Helix work item execution + HelixPostCommands: '' # optional -- commands to run after Helix work item execution + WorkItemDirectory: '' # optional -- a payload directory to zip up and send to Helix; requires WorkItemCommand; incompatible with XUnitProjects + WorkItemCommand: '' # optional -- a command to execute on the payload; requires WorkItemDirectory; incompatible with XUnitProjects + WorkItemTimeout: '' # optional -- a timeout in TimeSpan.Parse-ready value (e.g. 00:02:00) for the work item command; requires WorkItemDirectory; incompatible with XUnitProjects + CorrelationPayloadDirectory: '' # optional -- a directory to zip up and send to Helix as a correlation payload + XUnitProjects: '' # optional -- semicolon-delimited list of XUnitProjects to parse and send to Helix; requires XUnitRuntimeTargetFramework, XUnitPublishTargetFramework, XUnitRunnerVersion, and IncludeDotNetCli=true + XUnitWorkItemTimeout: '' # optional -- the workitem timeout in seconds for all workitems created from the xUnit projects specified by XUnitProjects + XUnitPublishTargetFramework: '' # optional -- framework to use to publish your xUnit projects + XUnitRuntimeTargetFramework: '' # optional -- framework to use for the xUnit console runner + XUnitRunnerVersion: '' # optional -- version of the xUnit nuget package you wish to use on Helix; required for XUnitProjects + IncludeDotNetCli: false # optional -- true will download a version of the .NET CLI onto the Helix machine as a correlation payload; requires DotNetCliPackageType and DotNetCliVersion + DotNetCliPackageType: '' # optional -- either 'sdk', 'runtime' or 'aspnetcore-runtime'; determines whether the sdk or runtime will be sent to Helix; see https://raw.githubusercontent.com/dotnet/core/main/release-notes/releases-index.json + DotNetCliVersion: '' # optional -- version of the CLI to send to Helix; based on this: https://raw.githubusercontent.com/dotnet/core/main/release-notes/releases-index.json + WaitForWorkItemCompletion: true # optional -- true will make the task wait until work items have been completed and fail the build if work items fail. False is "fire and forget." + IsExternal: false # [DEPRECATED] -- doesn't do anything, jobs are external if HelixAccessToken is empty and Creator is set + HelixBaseUri: 'https://helix.dot.net/' # optional -- sets the Helix API base URI (allows targeting https://helix.int-dot.net ) + Creator: '' # optional -- if the build is external, use this to specify who is sending the job + DisplayNamePrefix: 'Run Tests' # optional -- rename the beginning of the displayName of the steps in AzDO + condition: succeeded() # optional -- condition for step to execute; defaults to succeeded() + continueOnError: false # optional -- determines whether to continue the build if the step errors; defaults to false + +steps: + - powershell: 'powershell "$env:BUILD_SOURCESDIRECTORY\eng\common\msbuild.ps1 $env:BUILD_SOURCESDIRECTORY/${{ parameters.HelixProjectPath }} /restore /p:TreatWarningsAsErrors=false ${{ parameters.HelixProjectArguments }} /t:Test /bl:$env:BUILD_SOURCESDIRECTORY\artifacts\log\$env:BuildConfig\SendToHelix.binlog"' + displayName: ${{ parameters.DisplayNamePrefix }} (Windows) + env: + BuildConfig: $(_BuildConfig) + HelixSource: ${{ parameters.HelixSource }} + HelixType: ${{ parameters.HelixType }} + HelixBuild: ${{ parameters.HelixBuild }} + HelixConfiguration: ${{ parameters.HelixConfiguration }} + HelixTargetQueues: ${{ parameters.HelixTargetQueues }} + HelixAccessToken: ${{ parameters.HelixAccessToken }} + HelixPreCommands: ${{ parameters.HelixPreCommands }} + HelixPostCommands: ${{ parameters.HelixPostCommands }} + WorkItemDirectory: ${{ parameters.WorkItemDirectory }} + WorkItemCommand: ${{ parameters.WorkItemCommand }} + WorkItemTimeout: ${{ parameters.WorkItemTimeout }} + CorrelationPayloadDirectory: ${{ parameters.CorrelationPayloadDirectory }} + XUnitProjects: ${{ parameters.XUnitProjects }} + XUnitWorkItemTimeout: ${{ parameters.XUnitWorkItemTimeout }} + XUnitPublishTargetFramework: ${{ parameters.XUnitPublishTargetFramework }} + XUnitRuntimeTargetFramework: ${{ parameters.XUnitRuntimeTargetFramework }} + XUnitRunnerVersion: ${{ parameters.XUnitRunnerVersion }} + IncludeDotNetCli: ${{ parameters.IncludeDotNetCli }} + DotNetCliPackageType: ${{ parameters.DotNetCliPackageType }} + DotNetCliVersion: ${{ parameters.DotNetCliVersion }} + WaitForWorkItemCompletion: ${{ parameters.WaitForWorkItemCompletion }} + HelixBaseUri: ${{ parameters.HelixBaseUri }} + Creator: ${{ parameters.Creator }} + SYSTEM_ACCESSTOKEN: $(System.AccessToken) + condition: and(${{ parameters.condition }}, eq(variables['Agent.Os'], 'Windows_NT')) + continueOnError: ${{ parameters.continueOnError }} + - script: $BUILD_SOURCESDIRECTORY/eng/common/msbuild.sh $BUILD_SOURCESDIRECTORY/${{ parameters.HelixProjectPath }} /restore /p:TreatWarningsAsErrors=false ${{ parameters.HelixProjectArguments }} /t:Test /bl:$BUILD_SOURCESDIRECTORY/artifacts/log/$BuildConfig/SendToHelix.binlog + displayName: ${{ parameters.DisplayNamePrefix }} (Unix) + env: + BuildConfig: $(_BuildConfig) + HelixSource: ${{ parameters.HelixSource }} + HelixType: ${{ parameters.HelixType }} + HelixBuild: ${{ parameters.HelixBuild }} + HelixConfiguration: ${{ parameters.HelixConfiguration }} + HelixTargetQueues: ${{ parameters.HelixTargetQueues }} + HelixAccessToken: ${{ parameters.HelixAccessToken }} + HelixPreCommands: ${{ parameters.HelixPreCommands }} + HelixPostCommands: ${{ parameters.HelixPostCommands }} + WorkItemDirectory: ${{ parameters.WorkItemDirectory }} + WorkItemCommand: ${{ parameters.WorkItemCommand }} + WorkItemTimeout: ${{ parameters.WorkItemTimeout }} + CorrelationPayloadDirectory: ${{ parameters.CorrelationPayloadDirectory }} + XUnitProjects: ${{ parameters.XUnitProjects }} + XUnitWorkItemTimeout: ${{ parameters.XUnitWorkItemTimeout }} + XUnitPublishTargetFramework: ${{ parameters.XUnitPublishTargetFramework }} + XUnitRuntimeTargetFramework: ${{ parameters.XUnitRuntimeTargetFramework }} + XUnitRunnerVersion: ${{ parameters.XUnitRunnerVersion }} + IncludeDotNetCli: ${{ parameters.IncludeDotNetCli }} + DotNetCliPackageType: ${{ parameters.DotNetCliPackageType }} + DotNetCliVersion: ${{ parameters.DotNetCliVersion }} + WaitForWorkItemCompletion: ${{ parameters.WaitForWorkItemCompletion }} + HelixBaseUri: ${{ parameters.HelixBaseUri }} + Creator: ${{ parameters.Creator }} + SYSTEM_ACCESSTOKEN: $(System.AccessToken) + condition: and(${{ parameters.condition }}, ne(variables['Agent.Os'], 'Windows_NT')) + continueOnError: ${{ parameters.continueOnError }} diff --git a/eng/common/core-templates/steps/source-build.yml b/eng/common/core-templates/steps/source-build.yml new file mode 100644 index 00000000000..bdd725b496f --- /dev/null +++ b/eng/common/core-templates/steps/source-build.yml @@ -0,0 +1,134 @@ +parameters: + # This template adds arcade-powered source-build to CI. + + # This is a 'steps' template, and is intended for advanced scenarios where the existing build + # infra has a careful build methodology that must be followed. For example, a repo + # (dotnet/runtime) might choose to clone the GitHub repo only once and store it as a pipeline + # artifact for all subsequent jobs to use, to reduce dependence on a strong network connection to + # GitHub. Using this steps template leaves room for that infra to be included. + + # Defines the platform on which to run the steps. See 'eng/common/core-templates/job/source-build.yml' + # for details. The entire object is described in the 'job' template for simplicity, even though + # the usage of the properties on this object is split between the 'job' and 'steps' templates. + platform: {} + is1ESPipeline: false + +steps: +# Build. Keep it self-contained for simple reusability. (No source-build-specific job variables.) +- script: | + set -x + df -h + + # If building on the internal project, the artifact feeds variable may be available (usually only if needed) + # In that case, call the feed setup script to add internal feeds corresponding to public ones. + # In addition, add an msbuild argument to copy the WIP from the repo to the target build location. + # This is because SetupNuGetSources.sh will alter the current NuGet.config file, and we need to preserve those + # changes. + internalRestoreArgs= + if [ '$(dn-bot-dnceng-artifact-feeds-rw)' != '$''(dn-bot-dnceng-artifact-feeds-rw)' ]; then + # Temporarily work around https://github.com/dotnet/arcade/issues/7709 + chmod +x $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh + $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh $(Build.SourcesDirectory)/NuGet.config $(dn-bot-dnceng-artifact-feeds-rw) + internalRestoreArgs='/p:CopyWipIntoInnerSourceBuildRepo=true' + + # The 'Copy WIP' feature of source build uses git stash to apply changes from the original repo. + # This only works if there is a username/email configured, which won't be the case in most CI runs. + git config --get user.email + if [ $? -ne 0 ]; then + git config user.email dn-bot@microsoft.com + git config user.name dn-bot + fi + fi + + # If building on the internal project, the internal storage variable may be available (usually only if needed) + # In that case, add variables to allow the download of internal runtimes if the specified versions are not found + # in the default public locations. + internalRuntimeDownloadArgs= + if [ '$(dotnetbuilds-internal-container-read-token-base64)' != '$''(dotnetbuilds-internal-container-read-token-base64)' ]; then + internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) --runtimesourcefeed https://dotnetbuilds.blob.core.windows.net/internal --runtimesourcefeedkey $(dotnetbuilds-internal-container-read-token-base64)' + fi + + buildConfig=Release + # Check if AzDO substitutes in a build config from a variable, and use it if so. + if [ '$(_BuildConfig)' != '$''(_BuildConfig)' ]; then + buildConfig='$(_BuildConfig)' + fi + + officialBuildArgs= + if [ '${{ and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}' = 'True' ]; then + officialBuildArgs='/p:DotNetPublishUsingPipelines=true /p:OfficialBuildId=$(BUILD.BUILDNUMBER)' + fi + + targetRidArgs= + if [ '${{ parameters.platform.targetRID }}' != '' ]; then + targetRidArgs='/p:TargetRid=${{ parameters.platform.targetRID }}' + fi + + runtimeOsArgs= + if [ '${{ parameters.platform.runtimeOS }}' != '' ]; then + runtimeOsArgs='/p:RuntimeOS=${{ parameters.platform.runtimeOS }}' + fi + + baseOsArgs= + if [ '${{ parameters.platform.baseOS }}' != '' ]; then + baseOsArgs='/p:BaseOS=${{ parameters.platform.baseOS }}' + fi + + publishArgs= + if [ '${{ parameters.platform.skipPublishValidation }}' != 'true' ]; then + publishArgs='--publish' + fi + + assetManifestFileName=SourceBuild_RidSpecific.xml + if [ '${{ parameters.platform.name }}' != '' ]; then + assetManifestFileName=SourceBuild_${{ parameters.platform.name }}.xml + fi + + ${{ coalesce(parameters.platform.buildScript, './build.sh') }} --ci \ + --configuration $buildConfig \ + --restore --build --pack $publishArgs -bl \ + $officialBuildArgs \ + $internalRuntimeDownloadArgs \ + $internalRestoreArgs \ + $targetRidArgs \ + $runtimeOsArgs \ + $baseOsArgs \ + /p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \ + /p:ArcadeBuildFromSource=true \ + /p:DotNetBuildSourceOnly=true \ + /p:DotNetBuildRepo=true \ + /p:AssetManifestFileName=$assetManifestFileName + displayName: Build + +# Upload build logs for diagnosis. +- task: CopyFiles@2 + displayName: Prepare BuildLogs staging directory + inputs: + SourceFolder: '$(Build.SourcesDirectory)' + Contents: | + **/*.log + **/*.binlog + artifacts/sb/prebuilt-report/** + TargetFolder: '$(Build.StagingDirectory)/BuildLogs' + CleanTargetFolder: true + continueOnError: true + condition: succeededOrFailed() + +- template: /eng/common/core-templates/steps/publish-pipeline-artifacts.yml + parameters: + is1ESPipeline: ${{ parameters.is1ESPipeline }} + args: + displayName: Publish BuildLogs + targetPath: '$(Build.StagingDirectory)/BuildLogs' + artifactName: BuildLogs_SourceBuild_${{ parameters.platform.name }}_Attempt$(System.JobAttempt) + continueOnError: true + condition: succeededOrFailed() + +# Manually inject component detection so that we can ignore the source build upstream cache, which contains +# a nupkg cache of input packages (a local feed). +# This path must match the upstream cache path in property 'CurrentRepoSourceBuiltNupkgCacheDir' +# in src\Microsoft.DotNet.Arcade.Sdk\tools\SourceBuild\SourceBuildArcade.targets +- task: ComponentGovernanceComponentDetection@0 + displayName: Component Detection (Exclude upstream cache) + inputs: + ignoreDirectories: '$(Build.SourcesDirectory)/artifacts/sb/src/artifacts/obj/source-built-upstream-cache' diff --git a/eng/common/core-templates/variables/pool-providers.yml b/eng/common/core-templates/variables/pool-providers.yml new file mode 100644 index 00000000000..41053d382a2 --- /dev/null +++ b/eng/common/core-templates/variables/pool-providers.yml @@ -0,0 +1,8 @@ +parameters: + is1ESPipeline: false + +variables: + - ${{ if eq(parameters.is1ESPipeline, 'true') }}: + - template: /eng/common/templates-official/variables/pool-providers.yml + - ${{ else }}: + - template: /eng/common/templates/variables/pool-providers.yml \ No newline at end of file diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1 index 091023970f1..aab40de3fd9 100644 --- a/eng/common/sdk-task.ps1 +++ b/eng/common/sdk-task.ps1 @@ -64,7 +64,7 @@ try { $GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty } if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) { - $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.8.5" -MemberType NoteProperty + $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.10.0-pre.4.0" -MemberType NoteProperty } if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") { $xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true diff --git a/eng/common/template-guidance.md b/eng/common/template-guidance.md new file mode 100644 index 00000000000..595917fac1a --- /dev/null +++ b/eng/common/template-guidance.md @@ -0,0 +1,137 @@ +# Overview + +Arcade provides templates for public (`/templates`) and 1ES pipeline templates (`/templates-official`) scenarios. Pipelines which are required to be managed by 1ES pipeline templates should reference `/templates-offical`, all other pipelines may reference `/templates`. + +## How to use + +Basic guidance is: + +- 1ES Pipeline Template or 1ES Microbuild template runs should reference `eng/common/templates-official`. Any internal production-graded pipeline should use these templates. + +- All other runs should reference `eng/common/templates`. + +See [azure-pipelines.yml](../../azure-pipelines.yml) (templates-official example) or [azure-pipelines-pr.yml](../../azure-pipelines-pr.yml) (templates example) for examples. + +#### The `templateIs1ESManaged` parameter + +The `templateIs1ESManaged` is available on most templates and affects which of the variants is used for nested templates. See [Development Notes](#development-notes) below for more information on the `templateIs1ESManaged1 parameter. + +- For templates under `job/`, `jobs/`, `steps`, or `post-build/`, this parameter must be explicitly set. + +## Multiple outputs + +1ES pipeline templates impose a policy where every publish artifact execution results in additional security scans being injected into your pipeline. When using `templates-official/jobs/jobs.yml`, Arcade reduces the number of additional security injections by gathering all publishing outputs into the [Build.ArtifactStagingDirectory](https://learn.microsoft.com/en-us/azure/devops/pipelines/build/variables?view=azure-devops&tabs=yaml#build-variables-devops-services), and utilizing the [outputParentDirectory](https://eng.ms/docs/cloud-ai-platform/devdiv/one-engineering-system-1es/1es-docs/1es-pipeline-templates/features/outputs#multiple-outputs) feature of 1ES pipeline templates. When implementing your pipeline, if you ensure publish artifacts are located in the `$(Build.ArtifactStagingDirectory)`, and utilize the 1ES provided template context, then you can reduce the number of security scans for your pipeline. + +Example: +``` yaml +# azure-pipelines.yml +extends: + template: azure-pipelines/MicroBuild.1ES.Official.yml@MicroBuildTemplate + parameters: + stages: + - stage: build + jobs: + - template: /eng/common/templates-official/jobs/jobs.yml@self + parameters: + # 1ES makes use of outputs to reduce security task injection overhead + templateContext: + outputs: + - output: pipelineArtifact + displayName: 'Publish logs from source' + continueOnError: true + condition: always() + targetPath: $(Build.ArtifactStagingDirectory)/artifacts/log + artifactName: Logs + jobs: + - job: Windows + steps: + - script: echo "friendly neighborhood" > artifacts/marvel/spiderman.txt + # copy build outputs to artifact staging directory for publishing + - task: CopyFiles@2 + displayName: Gather build output + inputs: + SourceFolder: '$(Build.SourcesDirectory)/artifacts/marvel' + Contents: '**' + TargetFolder: '$(Build.ArtifactStagingDirectory)/artifacts/marvel' +``` + +Note: Multiple outputs are ONLY applicable to 1ES PT publishing (only usable when referencing `templates-official`). + +# Development notes + +**Folder / file structure** + +``` text +eng\common\ + [templates || templates-official]\ + job\ + job.yml (shim + artifact publishing logic) + onelocbuild.yml (shim) + publish-build-assets.yml (shim) + source-build.yml (shim) + source-index-stage1.yml (shim) + jobs\ + codeql-build.yml (shim) + jobs.yml (shim) + source-build.yml (shim) + post-build\ + post-build.yml (shim) + trigger-subscription.yml (shim) + common-variabls.yml (shim) + setup-maestro-vars.yml (shim) + steps\ + publish-build-artifacts.yml (logic) + publish-pipeline-artifacts.yml (logic) + add-build-channel.yml (shim) + component-governance.yml (shim) + generate-sbom.yml (shim) + publish-logs.yml (shim) + retain-build.yml (shim) + send-to-helix.yml (shim) + source-build.yml (shim) + variables\ + pool-providers.yml (logic + redirect) # templates/variables/pool-providers.yml will redirect to templates-official/variables/pool-providers.yml if you are running in the internal project + sdl-variables.yml (logic) + core-templates\ + job\ + job.yml (logic) + onelocbuild.yml (logic) + publish-build-assets.yml (logic) + source-build.yml (logic) + source-index-stage1.yml (logic) + jobs\ + codeql-build.yml (logic) + jobs.yml (logic) + source-build.yml (logic) + post-build\ + common-variabls.yml (logic) + post-build.yml (logic) + setup-maestro-vars.yml (logic) + trigger-subscription.yml (logic) + steps\ + add-build-to-channel.yml (logic) + component-governance.yml (logic) + generate-sbom.yml (logic) + publish-build-artifacts.yml (redirect) + publish-logs.yml (logic) + publish-pipeline-artifacts.yml (redirect) + retain-build.yml (logic) + send-to-helix.yml (logic) + source-build.yml (logic) + variables\ + pool-providers.yml (redirect) +``` + +In the table above, a file is designated as "shim", "logic", or "redirect". + +- shim - represents a yaml file which is an intermediate step between pipeline logic and .Net Core Engineering's templates (`core-templates`) and defines the `is1ESPipeline` parameter value. + +- logic - represents actual base template logic. + +- redirect- represents a file in `core-templates` which redirects to the "logic" file in either `templates` or `templates-official`. + +Logic for Arcade's templates live **primarily** in the `core-templates` folder. The exceptions to the location of the logic files are around artifact publishing, which is handled differently between 1es pipeline templates and standard templates. `templates` and `templates-official` provide shim entry points which redirect to `core-templates` while also defining the `is1ESPipeline` parameter. If a shim is referenced in `templates`, then `is1ESPipeline` is set to `false`. If a shim is referenced in `templates-official`, then `is1ESPipeline` is set to `true`. + +Within `templates` and `templates-official`, the templates at the "stages", and "jobs" / "job" level have been replaced with shims. Templates at the "steps" and "variables" level are typically too granular to be replaced with shims and instead persist logic which is directly applicable to either scenario. + +Within `core-templates`, there are a handful of places where logic is dependent on which shim entry point was used. In those places, we redirect back to the respective logic file in `templates` or `templates-official`. diff --git a/eng/common/templates-official/job/job.yml b/eng/common/templates-official/job/job.yml index 761acc5eb62..4724e9aaa80 100644 --- a/eng/common/templates-official/job/job.yml +++ b/eng/common/templates-official/job/job.yml @@ -1,264 +1,62 @@ -# Internal resources (telemetry, microbuild) can only be accessed from non-public projects, -# and some (Microbuild) should only be applied to non-PR cases for internal builds. - -parameters: -# Job schema parameters - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#job - cancelTimeoutInMinutes: '' - condition: '' - container: '' - continueOnError: false - dependsOn: '' - displayName: '' - pool: '' - steps: [] - strategy: '' - timeoutInMinutes: '' - variables: [] - workspace: '' - templateContext: '' - -# Job base template specific parameters - # See schema documentation - https://github.com/dotnet/arcade/blob/master/Documentation/AzureDevOps/TemplateSchema.md - artifacts: '' - enableMicrobuild: false - enablePublishBuildArtifacts: false - enablePublishBuildAssets: false - enablePublishTestResults: false - enablePublishUsingPipelines: false - enableBuildRetry: false - disableComponentGovernance: '' - componentGovernanceIgnoreDirectories: '' - mergeTestResults: false - testRunTitle: '' - testResultsFormat: '' - name: '' - preSteps: [] - runAsPublic: false -# Sbom related params - enableSbom: true - PackageVersion: 7.0.0 - BuildDropPath: '$(Build.SourcesDirectory)/artifacts' - jobs: -- job: ${{ parameters.name }} - - ${{ if ne(parameters.cancelTimeoutInMinutes, '') }}: - cancelTimeoutInMinutes: ${{ parameters.cancelTimeoutInMinutes }} - - ${{ if ne(parameters.condition, '') }}: - condition: ${{ parameters.condition }} - - ${{ if ne(parameters.container, '') }}: - container: ${{ parameters.container }} - - ${{ if ne(parameters.continueOnError, '') }}: - continueOnError: ${{ parameters.continueOnError }} - - ${{ if ne(parameters.dependsOn, '') }}: - dependsOn: ${{ parameters.dependsOn }} - - ${{ if ne(parameters.displayName, '') }}: - displayName: ${{ parameters.displayName }} - - ${{ if ne(parameters.pool, '') }}: - pool: ${{ parameters.pool }} - - ${{ if ne(parameters.strategy, '') }}: - strategy: ${{ parameters.strategy }} - - ${{ if ne(parameters.timeoutInMinutes, '') }}: - timeoutInMinutes: ${{ parameters.timeoutInMinutes }} - - ${{ if ne(parameters.templateContext, '') }}: - templateContext: ${{ parameters.templateContext }} - - variables: - - ${{ if ne(parameters.enableTelemetry, 'false') }}: - - name: DOTNET_CLI_TELEMETRY_PROFILE - value: '$(Build.Repository.Uri)' - - ${{ if eq(parameters.enableRichCodeNavigation, 'true') }}: - - name: EnableRichCodeNavigation - value: 'true' - # Retry signature validation up to three times, waiting 2 seconds between attempts. - # See https://learn.microsoft.com/en-us/nuget/reference/errors-and-warnings/nu3028#retry-untrusted-root-failures - - name: NUGET_EXPERIMENTAL_CHAIN_BUILD_RETRY_POLICY - value: 3,2000 - - ${{ each variable in parameters.variables }}: - # handle name-value variable syntax - # example: - # - name: [key] - # value: [value] - - ${{ if ne(variable.name, '') }}: - - name: ${{ variable.name }} - value: ${{ variable.value }} - - # handle variable groups - - ${{ if ne(variable.group, '') }}: - - group: ${{ variable.group }} - - # handle template variable syntax - # example: - # - template: path/to/template.yml - # parameters: - # [key]: [value] - - ${{ if ne(variable.template, '') }}: - - template: ${{ variable.template }} - ${{ if ne(variable.parameters, '') }}: - parameters: ${{ variable.parameters }} - - # handle key-value variable syntax. - # example: - # - [key]: [value] - - ${{ if and(eq(variable.name, ''), eq(variable.group, ''), eq(variable.template, '')) }}: - - ${{ each pair in variable }}: - - name: ${{ pair.key }} - value: ${{ pair.value }} - - # DotNet-HelixApi-Access provides 'HelixApiAccessToken' for internal builds - - ${{ if and(eq(parameters.enableTelemetry, 'true'), eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - group: DotNet-HelixApi-Access - - ${{ if ne(parameters.workspace, '') }}: - workspace: ${{ parameters.workspace }} - - steps: - - ${{ if ne(parameters.preSteps, '') }}: - - ${{ each preStep in parameters.preSteps }}: - - ${{ preStep }} - - - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - ${{ if eq(parameters.enableMicrobuild, 'true') }}: - - task: MicroBuildSigningPlugin@4 - displayName: Install MicroBuild plugin - inputs: - signType: $(_SignType) - zipSources: false - feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json - env: - TeamName: $(_TeamName) - MicroBuildOutputFolderOverride: '$(Agent.TempDirectory)' - continueOnError: ${{ parameters.continueOnError }} - 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@1 - - - ${{ if and(ne(parameters.artifacts.download, 'false'), ne(parameters.artifacts.download, '')) }}: - - task: DownloadPipelineArtifact@2 - inputs: - buildType: current - artifactName: ${{ coalesce(parameters.artifacts.download.name, 'Artifacts_$(Agent.OS)_$(_BuildConfig)') }} - targetPath: ${{ coalesce(parameters.artifacts.download.path, 'artifacts') }} - itemPattern: ${{ coalesce(parameters.artifacts.download.pattern, '**') }} - - - ${{ each step in parameters.steps }}: - - ${{ step }} - - - ${{ if eq(parameters.enableRichCodeNavigation, true) }}: - - task: RichCodeNavIndexer@0 - displayName: RichCodeNav Upload - inputs: - languages: ${{ coalesce(parameters.richCodeNavigationLanguage, 'csharp') }} - environment: ${{ coalesce(parameters.richCodeNavigationEnvironment, 'internal') }} - richNavLogOutputDirectory: $(Build.SourcesDirectory)/artifacts/bin - uploadRichNavArtifacts: ${{ coalesce(parameters.richCodeNavigationUploadArtifacts, false) }} - continueOnError: true - - - template: /eng/common/templates-official/steps/component-governance.yml - parameters: - ${{ if eq(parameters.disableComponentGovernance, '') }}: - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.runAsPublic, 'false'), or(startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/dotnet/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/microsoft/'), eq(variables['Build.SourceBranch'], 'refs/heads/main'))) }}: - disableComponentGovernance: false - ${{ else }}: - disableComponentGovernance: true - ${{ else }}: - disableComponentGovernance: ${{ parameters.disableComponentGovernance }} - componentGovernanceIgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }} - - - ${{ if eq(parameters.enableMicrobuild, 'true') }}: - - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - task: MicroBuildCleanup@1 - displayName: Execute Microbuild cleanup tasks - condition: and(always(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT')) - continueOnError: ${{ parameters.continueOnError }} - env: - TeamName: $(_TeamName) - - - ${{ if ne(parameters.artifacts.publish, '') }}: - - ${{ if and(ne(parameters.artifacts.publish.artifacts, 'false'), ne(parameters.artifacts.publish.artifacts, '')) }}: - - task: CopyFiles@2 - displayName: Gather binaries for publish to artifacts - inputs: - SourceFolder: 'artifacts/bin' - Contents: '**' - TargetFolder: '$(Build.ArtifactStagingDirectory)/artifacts/bin' - - task: CopyFiles@2 - displayName: Gather packages for publish to artifacts - inputs: - SourceFolder: 'artifacts/packages' - Contents: '**' - TargetFolder: '$(Build.ArtifactStagingDirectory)/artifacts/packages' - - task: 1ES.PublishBuildArtifacts@1 - displayName: Publish pipeline artifacts - inputs: - PathtoPublish: '$(Build.ArtifactStagingDirectory)/artifacts' - PublishLocation: Container - ArtifactName: ${{ coalesce(parameters.artifacts.publish.artifacts.name , 'Artifacts_$(Agent.Os)_$(_BuildConfig)') }} - continueOnError: true - condition: always() - - ${{ if and(ne(parameters.artifacts.publish.logs, 'false'), ne(parameters.artifacts.publish.logs, '')) }}: - - task: 1ES.PublishPipelineArtifact@1 - inputs: - targetPath: 'artifacts/log' - artifactName: ${{ coalesce(parameters.artifacts.publish.logs.name, 'Logs_Build_$(Agent.Os)_$(_BuildConfig)_Attempt$(System.JobAttempt)') }} - displayName: 'Publish logs' - continueOnError: true - condition: always() - - - ${{ if ne(parameters.enablePublishBuildArtifacts, 'false') }}: - - task: 1ES.PublishBuildArtifacts@1 - displayName: Publish Logs - inputs: - PathtoPublish: '$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)' - PublishLocation: Container - ArtifactName: ${{ coalesce(parameters.enablePublishBuildArtifacts.artifactName, '$(Agent.Os)_$(Agent.JobName)' ) }} - continueOnError: true - condition: always() - - - ${{ if or(and(eq(parameters.enablePublishTestResults, 'true'), eq(parameters.testResultsFormat, '')), eq(parameters.testResultsFormat, 'xunit')) }}: - - task: PublishTestResults@2 - displayName: Publish XUnit Test Results - inputs: - testResultsFormat: 'xUnit' - testResultsFiles: '*.xml' - searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)' - testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-xunit - mergeTestResults: ${{ parameters.mergeTestResults }} - continueOnError: true - condition: always() - - ${{ if or(and(eq(parameters.enablePublishTestResults, 'true'), eq(parameters.testResultsFormat, '')), eq(parameters.testResultsFormat, 'vstest')) }}: - - task: PublishTestResults@2 - displayName: Publish TRX Test Results - inputs: - testResultsFormat: 'VSTest' - testResultsFiles: '*.trx' - searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)' - testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-trx - mergeTestResults: ${{ parameters.mergeTestResults }} - continueOnError: true - condition: always() - - - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.enableSbom, 'true')) }}: - - template: /eng/common/templates-official/steps/generate-sbom.yml - parameters: - PackageVersion: ${{ parameters.packageVersion}} - BuildDropPath: ${{ parameters.buildDropPath }} - IgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }} - - - ${{ if eq(parameters.enableBuildRetry, 'true') }}: - - task: 1ES.PublishPipelineArtifact@1 - inputs: - targetPath: '$(Build.SourcesDirectory)\eng\common\BuildConfiguration' - artifactName: 'BuildConfiguration' - displayName: 'Publish build retry configuration' - continueOnError: true \ No newline at end of file +- template: /eng/common/core-templates/job/job.yml + parameters: + is1ESPipeline: true + + # publish artifacts + # for 1ES managed templates, use the templateContext.output to handle multiple outputs. + templateContext: + outputParentDirectory: $(Build.ArtifactStagingDirectory) + outputs: + - ${{ if ne(parameters.artifacts.publish, '') }}: + - ${{ if and(ne(parameters.artifacts.publish.artifacts, 'false'), ne(parameters.artifacts.publish.artifacts, '')) }}: + - output: buildArtifacts + displayName: Publish pipeline artifacts + PathtoPublish: '$(Build.ArtifactStagingDirectory)/artifacts' + ArtifactName: ${{ coalesce(parameters.artifacts.publish.artifacts.name , 'Artifacts_$(Agent.Os)_$(_BuildConfig)') }} + condition: always() + continueOnError: true + - ${{ if and(ne(parameters.artifacts.publish.logs, 'false'), ne(parameters.artifacts.publish.logs, '')) }}: + - output: pipelineArtifact + targetPath: '$(Build.ArtifactStagingDirectory)/artifacts/log' + artifactName: ${{ coalesce(parameters.artifacts.publish.logs.name, 'Logs_Build_$(Agent.Os)_$(_BuildConfig)_Attempt$(System.JobAttempt)') }} + displayName: 'Publish logs' + continueOnError: true + condition: always() + + - ${{ if eq(parameters.enablePublishBuildArtifacts, true) }}: + - output: buildArtifacts + displayName: Publish Logs + PathtoPublish: '$(Build.ArtifactStagingDirectory)/artifacts/log/$(_BuildConfig)' + publishLocation: Container + ArtifactName: ${{ coalesce(parameters.enablePublishBuildArtifacts.artifactName, '$(Agent.Os)_$(Agent.JobName)' ) }} + continueOnError: true + condition: always() + + - ${{ if eq(parameters.enableBuildRetry, 'true') }}: + - output: pipelineArtifact + targetPath: '$(Build.ArtifactStagingDirectory)/artifacts/eng/common/BuildConfiguration' + artifactName: 'BuildConfiguration' + displayName: 'Publish build retry configuration' + continueOnError: true + + - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.enableSbom, 'true')) }}: + - output: pipelineArtifact + displayName: Publish SBOM manifest + continueOnError: true + targetPath: $(Build.ArtifactStagingDirectory)/sbom + artifactName: $(ARTIFACT_NAME) + + # add any outputs provided via root yaml + - ${{ if ne(parameters.templateContext.outputs, '') }}: + - ${{ each output in parameters.templateContext.outputs }}: + - ${{ output }} + + # add any remaining templateContext properties + ${{ each context in parameters.templateContext }}: + ${{ if and(ne(context.key, 'outputParentDirectory'), ne(context.key, 'outputs')) }}: + ${{ context.key }}: ${{ context.value }} + + ${{ each parameter in parameters }}: + ${{ if and(ne(parameter.key, 'templateContext'), ne(parameter.key, 'is1ESPipeline')) }}: + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/eng/common/templates-official/job/onelocbuild.yml b/eng/common/templates-official/job/onelocbuild.yml index 52b4d05d3f8..0f0c514b912 100644 --- a/eng/common/templates-official/job/onelocbuild.yml +++ b/eng/common/templates-official/job/onelocbuild.yml @@ -1,112 +1,7 @@ -parameters: - # Optional: dependencies of the job - dependsOn: '' - - # Optional: A defined YAML pool - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#pool - pool: '' - - CeapexPat: $(dn-bot-ceapex-package-r) # PAT for the loc AzDO instance https://dev.azure.com/ceapex - GithubPat: $(BotAccount-dotnet-bot-repo-PAT) - - SourcesDirectory: $(Build.SourcesDirectory) - CreatePr: true - AutoCompletePr: false - ReusePr: true - UseLfLineEndings: true - UseCheckedInLocProjectJson: false - SkipLocProjectJsonGeneration: false - LanguageSet: VS_Main_Languages - LclSource: lclFilesInRepo - LclPackageId: '' - RepoType: gitHub - GitHubOrg: dotnet - MirrorRepo: '' - MirrorBranch: main - condition: '' - JobNameSuffix: '' - jobs: -- job: OneLocBuild${{ parameters.JobNameSuffix }} - - dependsOn: ${{ parameters.dependsOn }} - - displayName: OneLocBuild${{ parameters.JobNameSuffix }} - - variables: - - group: OneLocBuildVariables # Contains the CeapexPat and GithubPat - - name: _GenerateLocProjectArguments - value: -SourcesDirectory ${{ parameters.SourcesDirectory }} - -LanguageSet "${{ parameters.LanguageSet }}" - -CreateNeutralXlfs - - ${{ if eq(parameters.UseCheckedInLocProjectJson, 'true') }}: - - name: _GenerateLocProjectArguments - value: ${{ variables._GenerateLocProjectArguments }} -UseCheckedInLocProjectJson - - template: /eng/common/templates-official/variables/pool-providers.yml - - ${{ if ne(parameters.pool, '') }}: - pool: ${{ parameters.pool }} - ${{ if eq(parameters.pool, '') }}: - pool: - # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) - ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: - name: AzurePipelines-EO - image: 1ESPT-Windows2022 - demands: Cmd - os: windows - # If it's not devdiv, it's dnceng - ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: - name: $(DncEngInternalBuildPool) - image: 1es-windows-2022 - os: windows - - steps: - - ${{ if ne(parameters.SkipLocProjectJsonGeneration, 'true') }}: - - task: Powershell@2 - inputs: - filePath: $(Build.SourcesDirectory)/eng/common/generate-locproject.ps1 - arguments: $(_GenerateLocProjectArguments) - displayName: Generate LocProject.json - condition: ${{ parameters.condition }} - - - task: OneLocBuild@2 - displayName: OneLocBuild - env: - SYSTEM_ACCESSTOKEN: $(System.AccessToken) - inputs: - locProj: eng/Localize/LocProject.json - outDir: $(Build.ArtifactStagingDirectory) - lclSource: ${{ parameters.LclSource }} - lclPackageId: ${{ parameters.LclPackageId }} - isCreatePrSelected: ${{ parameters.CreatePr }} - isAutoCompletePrSelected: ${{ parameters.AutoCompletePr }} - ${{ if eq(parameters.CreatePr, true) }}: - isUseLfLineEndingsSelected: ${{ parameters.UseLfLineEndings }} - ${{ if eq(parameters.RepoType, 'gitHub') }}: - isShouldReusePrSelected: ${{ parameters.ReusePr }} - packageSourceAuth: patAuth - patVariable: ${{ parameters.CeapexPat }} - ${{ if eq(parameters.RepoType, 'gitHub') }}: - repoType: ${{ parameters.RepoType }} - gitHubPatVariable: "${{ parameters.GithubPat }}" - ${{ if ne(parameters.MirrorRepo, '') }}: - isMirrorRepoSelected: true - gitHubOrganization: ${{ parameters.GitHubOrg }} - mirrorRepo: ${{ parameters.MirrorRepo }} - mirrorBranch: ${{ parameters.MirrorBranch }} - condition: ${{ parameters.condition }} - - - task: 1ES.PublishBuildArtifacts@1 - displayName: Publish Localization Files - inputs: - PathtoPublish: '$(Build.ArtifactStagingDirectory)/loc' - PublishLocation: Container - ArtifactName: Loc - condition: ${{ parameters.condition }} +- template: /eng/common/core-templates/job/onelocbuild.yml + parameters: + is1ESPipeline: true - - task: 1ES.PublishBuildArtifacts@1 - displayName: Publish LocProject.json - inputs: - PathtoPublish: '$(Build.SourcesDirectory)/eng/Localize/' - PublishLocation: Container - ArtifactName: Loc - condition: ${{ parameters.condition }} \ No newline at end of file + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/eng/common/templates-official/job/publish-build-assets.yml b/eng/common/templates-official/job/publish-build-assets.yml index 38340d3e386..d667a70e8de 100644 --- a/eng/common/templates-official/job/publish-build-assets.yml +++ b/eng/common/templates-official/job/publish-build-assets.yml @@ -1,159 +1,7 @@ -parameters: - configuration: 'Debug' - - # Optional: condition for the job to run - condition: '' - - # Optional: 'true' if future jobs should run even if this job fails - continueOnError: false - - # Optional: dependencies of the job - dependsOn: '' - - # Optional: Include PublishBuildArtifacts task - enablePublishBuildArtifacts: false - - # Optional: A defined YAML pool - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#pool - pool: {} - - # Optional: should run as a public build even in the internal project - # if 'true', the build won't run any of the internal only steps, even if it is running in non-public projects. - runAsPublic: false - - # Optional: whether the build's artifacts will be published using release pipelines or direct feed publishing - publishUsingPipelines: false - - # Optional: whether the build's artifacts will be published using release pipelines or direct feed publishing - publishAssetsImmediately: false - - artifactsPublishingAdditionalParameters: '' - - signingValidationAdditionalParameters: '' - jobs: -- job: Asset_Registry_Publish - - dependsOn: ${{ parameters.dependsOn }} - timeoutInMinutes: 150 - - ${{ if eq(parameters.publishAssetsImmediately, 'true') }}: - displayName: Publish Assets - ${{ else }}: - displayName: Publish to Build Asset Registry - - variables: - - template: /eng/common/templates-official/variables/pool-providers.yml - - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - group: Publish-Build-Assets - - group: AzureDevOps-Artifact-Feeds-Pats - - name: runCodesignValidationInjection - value: false - # unconditional - needed for logs publishing (redactor tool version) - - template: /eng/common/templates-official/post-build/common-variables.yml - - pool: - # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) - ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: - name: AzurePipelines-EO - image: 1ESPT-Windows2022 - demands: Cmd - os: windows - # If it's not devdiv, it's dnceng - ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: - name: NetCore1ESPool-Publishing-Internal - image: windows.vs2019.amd64 - os: windows - 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: - artifactName: AssetManifests - downloadPath: '$(Build.StagingDirectory)/Download' - checkDownloadedFiles: true - condition: ${{ parameters.condition }} - continueOnError: ${{ parameters.continueOnError }} - - - task: NuGetAuthenticate@1 - - - task: PowerShell@2 - displayName: Publish Build Assets - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishBuildAssets -restore -msbuildEngine dotnet - /p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests' - /p:BuildAssetRegistryToken=$(MaestroAccessToken) - /p:MaestroApiEndpoint=https://maestro.dot.net - /p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }} - /p:OfficialBuildId=$(Build.BuildNumber) - condition: ${{ parameters.condition }} - continueOnError: ${{ parameters.continueOnError }} - - - task: powershell@2 - displayName: Create ReleaseConfigs Artifact - inputs: - targetType: inline - script: | - New-Item -Path "$(Build.StagingDirectory)/ReleaseConfigs" -ItemType Directory -Force - $filePath = "$(Build.StagingDirectory)/ReleaseConfigs/ReleaseConfigs.txt" - Add-Content -Path $filePath -Value $(BARBuildId) - Add-Content -Path $filePath -Value "$(DefaultChannels)" - Add-Content -Path $filePath -Value $(IsStableBuild) - - - task: 1ES.PublishBuildArtifacts@1 - displayName: Publish ReleaseConfigs Artifact - inputs: - PathtoPublish: '$(Build.StagingDirectory)/ReleaseConfigs' - PublishLocation: Container - ArtifactName: ReleaseConfigs - - - task: powershell@2 - displayName: Check if SymbolPublishingExclusionsFile.txt exists - inputs: - targetType: inline - script: | - $symbolExclusionfile = "$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt" - if(Test-Path -Path $symbolExclusionfile) - { - Write-Host "SymbolExclusionFile exists" - Write-Host "##vso[task.setvariable variable=SymbolExclusionFile]true" - } - else{ - Write-Host "Symbols Exclusion file does not exists" - Write-Host "##vso[task.setvariable variable=SymbolExclusionFile]false" - } - - - task: 1ES.PublishBuildArtifacts@1 - displayName: Publish SymbolPublishingExclusionsFile Artifact - condition: eq(variables['SymbolExclusionFile'], 'true') - inputs: - PathtoPublish: '$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' - PublishLocation: Container - ArtifactName: ReleaseConfigs - - - ${{ if eq(parameters.publishAssetsImmediately, 'true') }}: - - template: /eng/common/templates-official/post-build/setup-maestro-vars.yml - parameters: - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - - - task: PowerShell@2 - displayName: Publish Using Darc - inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 - arguments: -BuildId $(BARBuildId) - -PublishingInfraVersion 3 - -AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)' - -MaestroToken '$(MaestroApiAccessToken)' - -WaitPublishingFinish true - -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' - -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' +- template: /eng/common/core-templates/job/publish-build-assets.yml + parameters: + is1ESPipeline: true - - ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}: - - template: /eng/common/templates-official/steps/publish-logs.yml - parameters: - JobLabel: 'Publish_Artifacts_Logs' + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/eng/common/templates-official/job/source-build.yml b/eng/common/templates-official/job/source-build.yml index 2180e97a284..1a480034b67 100644 --- a/eng/common/templates-official/job/source-build.yml +++ b/eng/common/templates-official/job/source-build.yml @@ -1,67 +1,7 @@ -parameters: - # This template adds arcade-powered source-build to CI. The template produces a server job with a - # default ID 'Source_Build_Complete' to put in a dependency list if necessary. - - # Specifies the prefix for source-build jobs added to pipeline. Use this if disambiguation needed. - jobNamePrefix: 'Source_Build' - - # Defines the platform on which to run the job. By default, a linux-x64 machine, suitable for - # managed-only repositories. This is an object with these properties: - # - # name: '' - # The name of the job. This is included in the job ID. - # targetRID: '' - # The name of the target RID to use, instead of the one auto-detected by Arcade. - # nonPortable: false - # Enables non-portable mode. This means a more specific RID (e.g. fedora.32-x64 rather than - # linux-x64), and compiling against distro-provided packages rather than portable ones. - # skipPublishValidation: false - # Disables publishing validation. By default, a check is performed to ensure no packages are - # published by source-build. - # container: '' - # A container to use. Runs in docker. - # pool: {} - # A pool to use. Runs directly on an agent. - # buildScript: '' - # Specifies the build script to invoke to perform the build in the repo. The default - # './build.sh' should work for typical Arcade repositories, but this is customizable for - # difficult situations. - # jobProperties: {} - # A list of job properties to inject at the top level, for potential extensibility beyond - # container and pool. - platform: {} - jobs: -- job: ${{ parameters.jobNamePrefix }}_${{ parameters.platform.name }} - displayName: Source-Build (${{ parameters.platform.name }}) - - ${{ each property in parameters.platform.jobProperties }}: - ${{ property.key }}: ${{ property.value }} - - ${{ if ne(parameters.platform.container, '') }}: - container: ${{ parameters.platform.container }} - - ${{ if eq(parameters.platform.pool, '') }}: - # The default VM host AzDO pool. This should be capable of running Docker containers: almost all - # source-build builds run in Docker, including the default managed platform. - # /eng/common/templates-official/variables/pool-providers.yml can't be used here (some customers declare variables already), so duplicate its logic - pool: - ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore-Svc-Public' ), False, 'NetCore-Public')] - demands: ImageOverride -equals build.ubuntu.2004.amd64 - - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')] - image: 1es-mariner-2 - os: linux - - ${{ if ne(parameters.platform.pool, '') }}: - pool: ${{ parameters.platform.pool }} - - workspace: - clean: all +- template: /eng/common/core-templates/job/source-build.yml + parameters: + is1ESPipeline: true - steps: - - template: /eng/common/templates-official/steps/source-build.yml - parameters: - platform: ${{ parameters.platform }} + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/eng/common/templates-official/job/source-index-stage1.yml b/eng/common/templates-official/job/source-index-stage1.yml index 53a9ef51fd8..6d5ead316f9 100644 --- a/eng/common/templates-official/job/source-index-stage1.yml +++ b/eng/common/templates-official/job/source-index-stage1.yml @@ -1,67 +1,7 @@ -parameters: - runAsPublic: false - sourceIndexPackageVersion: 1.0.1-20240129.2 - 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: [] - binlogPath: artifacts/log/Debug/Build.binlog - condition: '' - dependsOn: '' - pool: '' - jobs: -- job: SourceIndexStage1 - dependsOn: ${{ parameters.dependsOn }} - condition: ${{ parameters.condition }} - variables: - - name: SourceIndexPackageVersion - value: ${{ parameters.sourceIndexPackageVersion }} - - name: SourceIndexPackageSource - value: ${{ parameters.sourceIndexPackageSource }} - - name: BinlogPath - value: ${{ parameters.binlogPath }} - - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - group: source-dot-net stage1 variables - - template: /eng/common/templates-official/variables/pool-providers.yml - - ${{ if ne(parameters.pool, '') }}: - pool: ${{ parameters.pool }} - ${{ if eq(parameters.pool, '') }}: - pool: - ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: $(DncEngPublicBuildPool) - image: windows.vs2022.amd64.open - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: $(DncEngInternalBuildPool) - image: windows.vs2022.amd64 - - steps: - - ${{ each preStep in parameters.preSteps }}: - - ${{ preStep }} - - - task: UseDotNet@2 - displayName: Use .NET 8 SDK - inputs: - packageType: sdk - version: 8.0.x - installationPath: $(Agent.TempDirectory)/dotnet - workingDirectory: $(Agent.TempDirectory) - - - script: | - $(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version $(SourceIndexPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools - $(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version $(SourceIndexPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools - displayName: Download Tools - # Set working directory to temp directory so 'dotnet' doesn't try to use global.json and use the repo's sdk. - workingDirectory: $(Agent.TempDirectory) - - - script: ${{ parameters.sourceIndexBuildCommand }} - displayName: Build Repository - - - script: $(Agent.TempDirectory)/.source-index/tools/BinLogToSln -i $(BinlogPath) -r $(Build.SourcesDirectory) -n $(Build.Repository.Name) -o .source-index/stage1output - displayName: Process Binlog into indexable sln +- template: /eng/common/core-templates/job/source-index-stage1.yml + parameters: + is1ESPipeline: true - - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - script: $(Agent.TempDirectory)/.source-index/tools/UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name) - displayName: Upload stage1 artifacts to source index - env: - BLOB_CONTAINER_URL: $(source-dot-net-stage1-blob-container-url) + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/eng/common/templates-official/jobs/codeql-build.yml b/eng/common/templates-official/jobs/codeql-build.yml index b68d3c2f319..a726322ecfe 100644 --- a/eng/common/templates-official/jobs/codeql-build.yml +++ b/eng/common/templates-official/jobs/codeql-build.yml @@ -1,31 +1,7 @@ -parameters: - # See schema documentation in /Documentation/AzureDevOps/TemplateSchema.md - continueOnError: false - # Required: A collection of jobs to run - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#job - jobs: [] - # Optional: if specified, restore and use this version of Guardian instead of the default. - overrideGuardianVersion: '' - jobs: -- template: /eng/common/templates-official/jobs/jobs.yml +- template: /eng/common/core-templates/jobs/codeql-build.yml parameters: - enableMicrobuild: false - enablePublishBuildArtifacts: false - enablePublishTestResults: false - enablePublishBuildAssets: false - enablePublishUsingPipelines: false - enableTelemetry: true + is1ESPipeline: true - variables: - - group: Publish-Build-Assets - # The Guardian version specified in 'eng/common/sdl/packages.config'. This value must be kept in - # sync with the packages.config file. - - name: DefaultGuardianVersion - value: 0.109.0 - - name: GuardianPackagesConfigFile - value: $(Build.SourcesDirectory)\eng\common\sdl\packages.config - - name: GuardianVersion - value: ${{ coalesce(parameters.overrideGuardianVersion, '$(DefaultGuardianVersion)') }} - - jobs: ${{ parameters.jobs }} - + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/eng/common/templates-official/jobs/jobs.yml b/eng/common/templates-official/jobs/jobs.yml index 857a0f8ba43..007deddaea0 100644 --- a/eng/common/templates-official/jobs/jobs.yml +++ b/eng/common/templates-official/jobs/jobs.yml @@ -1,97 +1,7 @@ -parameters: - # See schema documentation in /Documentation/AzureDevOps/TemplateSchema.md - continueOnError: false - - # Optional: Include PublishBuildArtifacts task - enablePublishBuildArtifacts: false - - # Optional: Enable publishing using release pipelines - enablePublishUsingPipelines: false - - # Optional: Enable running the source-build jobs to build repo from source - enableSourceBuild: false - - # Optional: Parameters for source-build template. - # See /eng/common/templates-official/jobs/source-build.yml for options - sourceBuildParameters: [] - - graphFileGeneration: - # Optional: Enable generating the graph files at the end of the build - enabled: false - # Optional: Include toolset dependencies in the generated graph files - includeToolset: false - - # Required: A collection of jobs to run - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#job - jobs: [] - - # Optional: Override automatically derived dependsOn value for "publish build assets" job - publishBuildAssetsDependsOn: '' - - # Optional: Publish the assets as soon as the publish to BAR stage is complete, rather doing so in a separate stage. - publishAssetsImmediately: false - - # Optional: If using publishAssetsImmediately and additional parameters are needed, can be used to send along additional parameters (normally sent to post-build.yml) - artifactsPublishingAdditionalParameters: '' - signingValidationAdditionalParameters: '' - - # Optional: should run as a public build even in the internal project - # if 'true', the build won't run any of the internal only steps, even if it is running in non-public projects. - runAsPublic: false - - enableSourceIndex: false - sourceIndexParams: {} - -# Internal resources (telemetry, microbuild) can only be accessed from non-public projects, -# and some (Microbuild) should only be applied to non-PR cases for internal builds. - jobs: -- ${{ each job in parameters.jobs }}: - - template: ../job/job.yml - parameters: - # pass along parameters - ${{ each parameter in parameters }}: - ${{ if ne(parameter.key, 'jobs') }}: - ${{ parameter.key }}: ${{ parameter.value }} - - # pass along job properties - ${{ each property in job }}: - ${{ if ne(property.key, 'job') }}: - ${{ property.key }}: ${{ property.value }} - - name: ${{ job.job }} - -- ${{ if eq(parameters.enableSourceBuild, true) }}: - - template: /eng/common/templates-official/jobs/source-build.yml - parameters: - allCompletedJobId: Source_Build_Complete - ${{ each parameter in parameters.sourceBuildParameters }}: - ${{ parameter.key }}: ${{ parameter.value }} - -- ${{ if eq(parameters.enableSourceIndex, 'true') }}: - - template: ../job/source-index-stage1.yml - parameters: - runAsPublic: ${{ parameters.runAsPublic }} - ${{ each parameter in parameters.sourceIndexParams }}: - ${{ parameter.key }}: ${{ parameter.value }} - -- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - ${{ if or(eq(parameters.enablePublishBuildAssets, true), eq(parameters.artifacts.publish.manifests, 'true'), ne(parameters.artifacts.publish.manifests, '')) }}: - - template: ../job/publish-build-assets.yml - parameters: - continueOnError: ${{ parameters.continueOnError }} - dependsOn: - - ${{ if ne(parameters.publishBuildAssetsDependsOn, '') }}: - - ${{ each job in parameters.publishBuildAssetsDependsOn }}: - - ${{ job.job }} - - ${{ if eq(parameters.publishBuildAssetsDependsOn, '') }}: - - ${{ each job in parameters.jobs }}: - - ${{ job.job }} - - ${{ if eq(parameters.enableSourceBuild, true) }}: - - Source_Build_Complete +- template: /eng/common/core-templates/jobs/jobs.yml + parameters: + is1ESPipeline: true - runAsPublic: ${{ parameters.runAsPublic }} - publishUsingPipelines: ${{ parameters.enablePublishUsingPipelines }} - publishAssetsImmediately: ${{ parameters.publishAssetsImmediately }} - enablePublishBuildArtifacts: ${{ parameters.enablePublishBuildArtifacts }} - artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} - signingValidationAdditionalParameters: ${{ parameters.signingValidationAdditionalParameters }} + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/eng/common/templates-official/jobs/source-build.yml b/eng/common/templates-official/jobs/source-build.yml index 2076f4e25b4..483e7b611f3 100644 --- a/eng/common/templates-official/jobs/source-build.yml +++ b/eng/common/templates-official/jobs/source-build.yml @@ -1,46 +1,7 @@ -parameters: - # This template adds arcade-powered source-build to CI. A job is created for each platform, as - # well as an optional server job that completes when all platform jobs complete. - - # The name of the "join" job for all source-build platforms. If set to empty string, the job is - # not included. Existing repo pipelines can use this job depend on all source-build jobs - # completing without maintaining a separate list of every single job ID: just depend on this one - # server job. By default, not included. Recommended name if used: 'Source_Build_Complete'. - allCompletedJobId: '' - - # See /eng/common/templates-official/job/source-build.yml - jobNamePrefix: 'Source_Build' - - # This is the default platform provided by Arcade, intended for use by a managed-only repo. - defaultManagedPlatform: - name: 'Managed' - container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9' - - # Defines the platforms on which to run build jobs. One job is created for each platform, and the - # object in this array is sent to the job template as 'platform'. If no platforms are specified, - # one job runs on 'defaultManagedPlatform'. - platforms: [] - jobs: +- template: /eng/common/core-templates/jobs/source-build.yml + parameters: + is1ESPipeline: true -- ${{ if ne(parameters.allCompletedJobId, '') }}: - - job: ${{ parameters.allCompletedJobId }} - displayName: Source-Build Complete - pool: server - dependsOn: - - ${{ each platform in parameters.platforms }}: - - ${{ parameters.jobNamePrefix }}_${{ platform.name }} - - ${{ if eq(length(parameters.platforms), 0) }}: - - ${{ parameters.jobNamePrefix }}_${{ parameters.defaultManagedPlatform.name }} - -- ${{ each platform in parameters.platforms }}: - - template: /eng/common/templates-official/job/source-build.yml - parameters: - jobNamePrefix: ${{ parameters.jobNamePrefix }} - platform: ${{ platform }} - -- ${{ if eq(length(parameters.platforms), 0) }}: - - template: /eng/common/templates-official/job/source-build.yml - parameters: - jobNamePrefix: ${{ parameters.jobNamePrefix }} - platform: ${{ parameters.defaultManagedPlatform }} + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} \ No newline at end of file diff --git a/eng/common/templates-official/post-build/common-variables.yml b/eng/common/templates-official/post-build/common-variables.yml index b9ede10bf09..c32fc49233f 100644 --- a/eng/common/templates-official/post-build/common-variables.yml +++ b/eng/common/templates-official/post-build/common-variables.yml @@ -1,24 +1,8 @@ variables: - - group: Publish-Build-Assets +- template: /eng/common/core-templates/post-build/common-variables.yml + parameters: + # Specifies whether to use 1ES + is1ESPipeline: true - # Whether the build is internal or not - - name: IsInternalBuild - value: ${{ and(ne(variables['System.TeamProject'], 'public'), contains(variables['Build.SourceBranch'], 'internal')) }} - - # Default Maestro++ API Endpoint and API Version - - name: MaestroApiEndPoint - value: "https://maestro.dot.net" - - name: MaestroApiAccessToken - value: $(MaestroAccessToken) - - name: MaestroApiVersion - value: "2020-02-20" - - - name: SourceLinkCLIVersion - value: 3.0.0 - - name: SymbolToolVersion - value: 1.0.1 - - name: BinlogToolVersion - value: 1.0.11 - - - name: runCodesignValidationInjection - value: false + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} \ No newline at end of file diff --git a/eng/common/templates-official/post-build/post-build.yml b/eng/common/templates-official/post-build/post-build.yml index da1f40958b4..2364c0fd4a5 100644 --- a/eng/common/templates-official/post-build/post-build.yml +++ b/eng/common/templates-official/post-build/post-build.yml @@ -1,285 +1,8 @@ -parameters: - # Which publishing infra should be used. THIS SHOULD MATCH THE VERSION ON THE BUILD MANIFEST. - # Publishing V1 is no longer supported - # Publishing V2 is no longer supported - # Publishing V3 is the default - - name: publishingInfraVersion - displayName: Which version of publishing should be used to promote the build definition? - type: number - default: 3 - values: - - 3 - - - name: BARBuildId - displayName: BAR Build Id - type: number - default: 0 - - - name: PromoteToChannelIds - displayName: Channel to promote BARBuildId to - type: string - default: '' - - - name: enableSourceLinkValidation - displayName: Enable SourceLink validation - type: boolean - default: false - - - name: enableSigningValidation - displayName: Enable signing validation - type: boolean - default: true - - - name: enableSymbolValidation - displayName: Enable symbol validation - type: boolean - default: false - - - name: enableNugetValidation - displayName: Enable NuGet validation - type: boolean - default: true - - - name: publishInstallersAndChecksums - displayName: Publish installers and checksums - type: boolean - default: true - - - name: SDLValidationParameters - type: object - default: - enable: false - publishGdn: false - continueOnError: false - params: '' - artifactNames: '' - downloadArtifacts: true - - # These parameters let the user customize the call to sdk-task.ps1 for publishing - # symbols & general artifacts as well as for signing validation - - name: symbolPublishingAdditionalParameters - displayName: Symbol publishing additional parameters - type: string - default: '' - - - name: artifactsPublishingAdditionalParameters - displayName: Artifact publishing additional parameters - type: string - default: '' - - - name: signingValidationAdditionalParameters - displayName: Signing validation additional parameters - type: string - default: '' - - # Which stages should finish execution before post-build stages start - - name: validateDependsOn - type: object - default: - - build - - - name: publishDependsOn - type: object - default: - - Validate - - # Optional: Call asset publishing rather than running in a separate stage - - name: publishAssetsImmediately - type: boolean - default: false - stages: -- ${{ if or(eq( parameters.enableNugetValidation, 'true'), eq(parameters.enableSigningValidation, 'true'), eq(parameters.enableSourceLinkValidation, 'true'), eq(parameters.SDLValidationParameters.enable, 'true')) }}: - - stage: Validate - dependsOn: ${{ parameters.validateDependsOn }} - displayName: Validate Build Assets - variables: - - template: common-variables.yml - - template: /eng/common/templates-official/variables/pool-providers.yml - jobs: - - job: - displayName: NuGet Validation - condition: and(succeededOrFailed(), eq( ${{ parameters.enableNugetValidation }}, 'true')) - pool: - # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) - ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: - name: AzurePipelines-EO - image: 1ESPT-Windows2022 - demands: Cmd - os: windows - # If it's not devdiv, it's dnceng - ${{ else }}: - name: $(DncEngInternalBuildPool) - image: 1es-windows-2022 - os: windows - - steps: - - template: setup-maestro-vars.yml - parameters: - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - - - task: DownloadBuildArtifacts@0 - displayName: Download Package Artifacts - inputs: - buildType: specific - buildVersionToDownload: specific - project: $(AzDOProjectName) - pipeline: $(AzDOPipelineId) - buildId: $(AzDOBuildId) - artifactName: PackageArtifacts - checkDownloadedFiles: true - - - task: PowerShell@2 - displayName: Validate - inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/nuget-validation.ps1 - arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ - -ToolDestinationPath $(Agent.BuildDirectory)/Extract/ - - - job: - displayName: Signing Validation - condition: and( eq( ${{ parameters.enableSigningValidation }}, 'true'), ne( variables['PostBuildSign'], 'true')) - pool: - # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) - ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: - name: AzurePipelines-EO - image: 1ESPT-Windows2022 - demands: Cmd - os: windows - # If it's not devdiv, it's dnceng - ${{ else }}: - name: $(DncEngInternalBuildPool) - image: 1es-windows-2022 - os: windows - steps: - - template: setup-maestro-vars.yml - parameters: - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - - - task: DownloadBuildArtifacts@0 - displayName: Download Package Artifacts - inputs: - buildType: specific - buildVersionToDownload: specific - project: $(AzDOProjectName) - pipeline: $(AzDOPipelineId) - buildId: $(AzDOBuildId) - artifactName: PackageArtifacts - checkDownloadedFiles: true - itemPattern: | - ** - !**/Microsoft.SourceBuild.Intermediate.*.nupkg - - # 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@1 - displayName: 'Authenticate to AzDO Feeds' - - # Signing validation will optionally work with the buildmanifest file which is downloaded from - # Azure DevOps above. - - task: PowerShell@2 - displayName: Validate - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task SigningValidation -restore -msbuildEngine vs - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts' - /p:SignCheckExclusionsFile='$(Build.SourcesDirectory)/eng/SignCheckExclusionsFile.txt' - ${{ parameters.signingValidationAdditionalParameters }} - - - template: ../steps/publish-logs.yml - parameters: - StageLabel: 'Validation' - JobLabel: 'Signing' - BinlogToolVersion: $(BinlogToolVersion) - - - job: - displayName: SourceLink Validation - condition: eq( ${{ parameters.enableSourceLinkValidation }}, 'true') - pool: - # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) - ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: - name: AzurePipelines-EO - image: 1ESPT-Windows2022 - demands: Cmd - os: windows - # If it's not devdiv, it's dnceng - ${{ else }}: - name: $(DncEngInternalBuildPool) - image: 1es-windows-2022 - os: windows - steps: - - template: setup-maestro-vars.yml - parameters: - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - buildType: specific - buildVersionToDownload: specific - project: $(AzDOProjectName) - pipeline: $(AzDOPipelineId) - buildId: $(AzDOBuildId) - artifactName: BlobArtifacts - checkDownloadedFiles: true - - - task: PowerShell@2 - displayName: Validate - inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/sourcelink-validation.ps1 - arguments: -InputPath $(Build.ArtifactStagingDirectory)/BlobArtifacts/ - -ExtractPath $(Agent.BuildDirectory)/Extract/ - -GHRepoName $(Build.Repository.Name) - -GHCommit $(Build.SourceVersion) - -SourcelinkCliVersion $(SourceLinkCLIVersion) - continueOnError: true - -- ${{ if ne(parameters.publishAssetsImmediately, 'true') }}: - - stage: publish_using_darc - ${{ if or(eq(parameters.enableNugetValidation, 'true'), eq(parameters.enableSigningValidation, 'true'), eq(parameters.enableSourceLinkValidation, 'true'), eq(parameters.SDLValidationParameters.enable, 'true')) }}: - dependsOn: ${{ parameters.publishDependsOn }} - ${{ else }}: - dependsOn: ${{ parameters.validateDependsOn }} - displayName: Publish using Darc - variables: - - template: common-variables.yml - - template: /eng/common/templates-official/variables/pool-providers.yml - jobs: - - job: - displayName: Publish Using Darc - timeoutInMinutes: 120 - pool: - # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) - ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: - name: AzurePipelines-EO - image: 1ESPT-Windows2022 - demands: Cmd - os: windows - # If it's not devdiv, it's dnceng - ${{ else }}: - name: NetCore1ESPool-Publishing-Internal - image: windows.vs2019.amd64 - os: windows - steps: - - template: setup-maestro-vars.yml - parameters: - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - - - task: NuGetAuthenticate@1 +- template: /eng/common/core-templates/post-build/post-build.yml + parameters: + # Specifies whether to use 1ES + is1ESPipeline: true - - task: PowerShell@2 - displayName: Publish Using Darc - inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 - arguments: -BuildId $(BARBuildId) - -PublishingInfraVersion ${{ parameters.publishingInfraVersion }} - -AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)' - -MaestroToken '$(MaestroApiAccessToken)' - -WaitPublishingFinish true - -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' - -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/eng/common/templates-official/post-build/setup-maestro-vars.yml b/eng/common/templates-official/post-build/setup-maestro-vars.yml index 0c87f149a4a..024397d8786 100644 --- a/eng/common/templates-official/post-build/setup-maestro-vars.yml +++ b/eng/common/templates-official/post-build/setup-maestro-vars.yml @@ -1,70 +1,8 @@ -parameters: - BARBuildId: '' - PromoteToChannelIds: '' - steps: - - ${{ if eq(coalesce(parameters.PromoteToChannelIds, 0), 0) }}: - - task: DownloadBuildArtifacts@0 - displayName: Download Release Configs - inputs: - buildType: current - artifactName: ReleaseConfigs - checkDownloadedFiles: true - - - task: PowerShell@2 - name: setReleaseVars - displayName: Set Release Configs Vars - inputs: - targetType: inline - pwsh: true - script: | - try { - if (!$Env:PromoteToMaestroChannels -or $Env:PromoteToMaestroChannels.Trim() -eq '') { - $Content = Get-Content $(Build.StagingDirectory)/ReleaseConfigs/ReleaseConfigs.txt - - $BarId = $Content | Select -Index 0 - $Channels = $Content | Select -Index 1 - $IsStableBuild = $Content | Select -Index 2 - - $AzureDevOpsProject = $Env:System_TeamProject - $AzureDevOpsBuildDefinitionId = $Env:System_DefinitionId - $AzureDevOpsBuildId = $Env:Build_BuildId - } - else { - $buildApiEndpoint = "${Env:MaestroApiEndPoint}/api/builds/${Env:BARBuildId}?api-version=${Env:MaestroApiVersion}" - - $apiHeaders = New-Object 'System.Collections.Generic.Dictionary[[String],[String]]' - $apiHeaders.Add('Accept', 'application/json') - $apiHeaders.Add('Authorization',"Bearer ${Env:MAESTRO_API_TOKEN}") - - $buildInfo = try { Invoke-WebRequest -Method Get -Uri $buildApiEndpoint -Headers $apiHeaders | ConvertFrom-Json } catch { Write-Host "Error: $_" } - - $BarId = $Env:BARBuildId - $Channels = $Env:PromoteToMaestroChannels -split "," - $Channels = $Channels -join "][" - $Channels = "[$Channels]" - - $IsStableBuild = $buildInfo.stable - $AzureDevOpsProject = $buildInfo.azureDevOpsProject - $AzureDevOpsBuildDefinitionId = $buildInfo.azureDevOpsBuildDefinitionId - $AzureDevOpsBuildId = $buildInfo.azureDevOpsBuildId - } - - Write-Host "##vso[task.setvariable variable=BARBuildId]$BarId" - Write-Host "##vso[task.setvariable variable=TargetChannels]$Channels" - Write-Host "##vso[task.setvariable variable=IsStableBuild]$IsStableBuild" +- template: /eng/common/core-templates/post-build/setup-maestro-vars.yml + parameters: + # Specifies whether to use 1ES + is1ESPipeline: true - Write-Host "##vso[task.setvariable variable=AzDOProjectName]$AzureDevOpsProject" - Write-Host "##vso[task.setvariable variable=AzDOPipelineId]$AzureDevOpsBuildDefinitionId" - Write-Host "##vso[task.setvariable variable=AzDOBuildId]$AzureDevOpsBuildId" - } - catch { - Write-Host $_ - Write-Host $_.Exception - Write-Host $_.ScriptStackTrace - exit 1 - } - env: - MAESTRO_API_TOKEN: $(MaestroApiAccessToken) - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToMaestroChannels: ${{ parameters.PromoteToChannelIds }} + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} \ No newline at end of file diff --git a/eng/common/templates-official/steps/add-build-to-channel.yml b/eng/common/templates-official/steps/add-build-to-channel.yml index f67a210d62f..543dea8c696 100644 --- a/eng/common/templates-official/steps/add-build-to-channel.yml +++ b/eng/common/templates-official/steps/add-build-to-channel.yml @@ -1,13 +1,7 @@ -parameters: - ChannelId: 0 - steps: -- task: PowerShell@2 - displayName: Add Build to Channel - inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/add-build-to-channel.ps1 - arguments: -BuildId $(BARBuildId) - -ChannelId ${{ parameters.ChannelId }} - -MaestroApiAccessToken $(MaestroApiAccessToken) - -MaestroApiEndPoint $(MaestroApiEndPoint) - -MaestroApiVersion $(MaestroApiVersion) +- template: /eng/common/core-templates/steps/add-build-to-channel.yml + parameters: + is1ESPipeline: true + + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/eng/common/templates-official/steps/component-governance.yml b/eng/common/templates-official/steps/component-governance.yml index 0ecec47b0c9..30bb3985ca2 100644 --- a/eng/common/templates-official/steps/component-governance.yml +++ b/eng/common/templates-official/steps/component-governance.yml @@ -1,13 +1,7 @@ -parameters: - disableComponentGovernance: false - componentGovernanceIgnoreDirectories: '' - steps: -- ${{ if eq(parameters.disableComponentGovernance, 'true') }}: - - script: "echo ##vso[task.setvariable variable=skipComponentGovernanceDetection]true" - displayName: Set skipComponentGovernanceDetection variable -- ${{ if ne(parameters.disableComponentGovernance, 'true') }}: - - task: ComponentGovernanceComponentDetection@0 - continueOnError: true - inputs: - ignoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }} \ No newline at end of file +- template: /eng/common/core-templates/steps/component-governance.yml + parameters: + is1ESPipeline: true + + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/eng/common/templates-official/steps/generate-sbom.yml b/eng/common/templates-official/steps/generate-sbom.yml index 488b560e8ba..9a89a4706d9 100644 --- a/eng/common/templates-official/steps/generate-sbom.yml +++ b/eng/common/templates-official/steps/generate-sbom.yml @@ -1,48 +1,7 @@ -# BuildDropPath - The root folder of the drop directory for which the manifest file will be generated. -# PackageName - The name of the package this SBOM represents. -# PackageVersion - The version of the package this SBOM represents. -# ManifestDirPath - The path of the directory where the generated manifest files will be placed -# IgnoreDirectories - Directories to ignore for SBOM generation. This will be passed through to the CG component detector. - -parameters: - PackageVersion: 7.0.0 - BuildDropPath: '$(Build.SourcesDirectory)/artifacts' - PackageName: '.NET' - ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom - IgnoreDirectories: '' - sbomContinueOnError: true - steps: -- task: PowerShell@2 - displayName: Prep for SBOM generation in (Non-linux) - condition: or(eq(variables['Agent.Os'], 'Windows_NT'), eq(variables['Agent.Os'], 'Darwin')) - inputs: - filePath: ./eng/common/generate-sbom-prep.ps1 - arguments: ${{parameters.manifestDirPath}} - -# Chmodding is a workaround for https://github.com/dotnet/arcade/issues/8461 -- script: | - chmod +x ./eng/common/generate-sbom-prep.sh - ./eng/common/generate-sbom-prep.sh ${{parameters.manifestDirPath}} - displayName: Prep for SBOM generation in (Linux) - condition: eq(variables['Agent.Os'], 'Linux') - continueOnError: ${{ parameters.sbomContinueOnError }} - -- task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0 - displayName: 'Generate SBOM manifest' - continueOnError: ${{ parameters.sbomContinueOnError }} - inputs: - PackageName: ${{ parameters.packageName }} - BuildDropPath: ${{ parameters.buildDropPath }} - PackageVersion: ${{ parameters.packageVersion }} - ManifestDirPath: ${{ parameters.manifestDirPath }} - ${{ if ne(parameters.IgnoreDirectories, '') }}: - AdditionalComponentDetectorArgs: '--IgnoreDirectories ${{ parameters.IgnoreDirectories }}' - -- task: 1ES.PublishPipelineArtifact@1 - displayName: Publish SBOM manifest - continueOnError: ${{parameters.sbomContinueOnError}} - inputs: - targetPath: '${{parameters.manifestDirPath}}' - artifactName: $(ARTIFACT_NAME) +- template: /eng/common/core-templates/steps/generate-sbom.yml + parameters: + is1ESPipeline: true + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/eng/common/templates-official/steps/publish-build-artifacts.yml b/eng/common/templates-official/steps/publish-build-artifacts.yml new file mode 100644 index 00000000000..100a3fc9849 --- /dev/null +++ b/eng/common/templates-official/steps/publish-build-artifacts.yml @@ -0,0 +1,41 @@ +parameters: +- name: displayName + type: string + default: 'Publish to Build Artifact' + +- name: condition + type: string + default: succeeded() + +- name: artifactName + type: string + +- name: pathToPublish + type: string + +- name: continueOnError + type: boolean + default: false + +- name: publishLocation + type: string + default: 'Container' + +- name: is1ESPipeline + type: boolean + default: true + +steps: +- ${{ if ne(parameters.is1ESPipeline, true) }}: + - 'eng/common/templates-official cannot be referenced from a non-1ES managed template': error +- task: 1ES.PublishBuildArtifacts@1 + displayName: ${{ parameters.displayName }} + condition: ${{ parameters.condition }} + ${{ if parameters.continueOnError }}: + continueOnError: ${{ parameters.continueOnError }} + inputs: + PublishLocation: ${{ parameters.publishLocation }} + PathtoPublish: ${{ parameters.pathToPublish }} + ${{ if parameters.artifactName }}: + ArtifactName: ${{ parameters.artifactName }} + diff --git a/eng/common/templates-official/steps/publish-logs.yml b/eng/common/templates-official/steps/publish-logs.yml index 84b2f559c56..579fd531e94 100644 --- a/eng/common/templates-official/steps/publish-logs.yml +++ b/eng/common/templates-official/steps/publish-logs.yml @@ -1,49 +1,7 @@ -parameters: - StageLabel: '' - JobLabel: '' - CustomSensitiveDataList: '' - # A default - in case value from eng/common/templates-official/post-build/common-variables.yml is not passed - BinlogToolVersion: '1.0.11' - steps: -- task: Powershell@2 - displayName: Prepare Binlogs to Upload - inputs: - targetType: inline - script: | - New-Item -ItemType Directory $(Build.SourcesDirectory)/PostBuildLogs/${{parameters.StageLabel}}/${{parameters.JobLabel}}/ - 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() - -- task: 1ES.PublishBuildArtifacts@1 - displayName: Publish Logs - inputs: - PathtoPublish: '$(Build.SourcesDirectory)/PostBuildLogs' - PublishLocation: Container - ArtifactName: PostBuildLogs - continueOnError: true - condition: always() +- template: /eng/common/core-templates/steps/publish-logs.yml + parameters: + is1ESPipeline: true + + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/eng/common/templates-official/steps/publish-pipeline-artifacts.yml b/eng/common/templates-official/steps/publish-pipeline-artifacts.yml new file mode 100644 index 00000000000..15d74a9d916 --- /dev/null +++ b/eng/common/templates-official/steps/publish-pipeline-artifacts.yml @@ -0,0 +1,26 @@ +parameters: +- name: is1ESPipeline + type: boolean + default: true + +- name: args + type: object + default: {} + +steps: +- ${{ if ne(parameters.is1ESPipeline, true) }}: + - 'eng/common/templates-official cannot be referenced from a non-1ES managed template': error +- task: 1ES.PublishPipelineArtifact@1 + displayName: ${{ coalesce(parameters.args.displayName, 'Publish to Build Artifact') }} + ${{ if parameters.args.condition }}: + condition: ${{ parameters.args.condition }} + ${{ else }}: + condition: succeeded() + ${{ if parameters.args.continueOnError }}: + continueOnError: ${{ parameters.args.continueOnError }} + inputs: + targetPath: ${{ parameters.args.targetPath }} + ${{ if parameters.args.artifactName }}: + artifactName: ${{ parameters.args.artifactName }} + ${{ if parameters.args.properties }}: + properties: ${{ properties.args.properties }} \ No newline at end of file diff --git a/eng/common/templates-official/steps/retain-build.yml b/eng/common/templates-official/steps/retain-build.yml index 83d97a26a01..5594551508a 100644 --- a/eng/common/templates-official/steps/retain-build.yml +++ b/eng/common/templates-official/steps/retain-build.yml @@ -1,28 +1,7 @@ -parameters: - # Optional azure devops PAT with build execute permissions for the build's organization, - # only needed if the build that should be retained ran on a different organization than - # the pipeline where this template is executing from - Token: '' - # Optional BuildId to retain, defaults to the current running build - BuildId: '' - # Azure devops Organization URI for the build in the https://dev.azure.com/ format. - # Defaults to the organization the current pipeline is running on - AzdoOrgUri: '$(System.CollectionUri)' - # Azure devops project for the build. Defaults to the project the current pipeline is running on - AzdoProject: '$(System.TeamProject)' - steps: - - task: powershell@2 - inputs: - targetType: 'filePath' - filePath: eng/common/retain-build.ps1 - pwsh: true - arguments: > - -AzdoOrgUri: ${{parameters.AzdoOrgUri}} - -AzdoProject ${{parameters.AzdoProject}} - -Token ${{coalesce(parameters.Token, '$env:SYSTEM_ACCESSTOKEN') }} - -BuildId ${{coalesce(parameters.BuildId, '$env:BUILD_ID')}} - displayName: Enable permanent build retention - env: - SYSTEM_ACCESSTOKEN: $(System.AccessToken) - BUILD_ID: $(Build.BuildId) \ No newline at end of file +- template: /eng/common/core-templates/steps/retain-build.yml + parameters: + is1ESPipeline: true + + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/eng/common/templates-official/steps/send-to-helix.yml b/eng/common/templates-official/steps/send-to-helix.yml index 68fa739c4ab..6500f21bf84 100644 --- a/eng/common/templates-official/steps/send-to-helix.yml +++ b/eng/common/templates-official/steps/send-to-helix.yml @@ -1,93 +1,7 @@ -# Please remember to update the documentation if you make changes to these parameters! -parameters: - HelixSource: 'pr/default' # required -- sources must start with pr/, official/, prodcon/, or agent/ - HelixType: 'tests/default/' # required -- Helix telemetry which identifies what type of data this is; should include "test" for clarity and must end in '/' - HelixBuild: $(Build.BuildNumber) # required -- the build number Helix will use to identify this -- automatically set to the AzDO build number - HelixTargetQueues: '' # required -- semicolon-delimited list of Helix queues to test on; see https://helix.dot.net/ for a list of queues - HelixAccessToken: '' # required -- access token to make Helix API requests; should be provided by the appropriate variable group - HelixProjectPath: 'eng/common/helixpublish.proj' # optional -- path to the project file to build relative to BUILD_SOURCESDIRECTORY - HelixProjectArguments: '' # optional -- arguments passed to the build command - HelixConfiguration: '' # optional -- additional property attached to a job - HelixPreCommands: '' # optional -- commands to run before Helix work item execution - HelixPostCommands: '' # optional -- commands to run after Helix work item execution - WorkItemDirectory: '' # optional -- a payload directory to zip up and send to Helix; requires WorkItemCommand; incompatible with XUnitProjects - WorkItemCommand: '' # optional -- a command to execute on the payload; requires WorkItemDirectory; incompatible with XUnitProjects - WorkItemTimeout: '' # optional -- a timeout in TimeSpan.Parse-ready value (e.g. 00:02:00) for the work item command; requires WorkItemDirectory; incompatible with XUnitProjects - CorrelationPayloadDirectory: '' # optional -- a directory to zip up and send to Helix as a correlation payload - XUnitProjects: '' # optional -- semicolon-delimited list of XUnitProjects to parse and send to Helix; requires XUnitRuntimeTargetFramework, XUnitPublishTargetFramework, XUnitRunnerVersion, and IncludeDotNetCli=true - XUnitWorkItemTimeout: '' # optional -- the workitem timeout in seconds for all workitems created from the xUnit projects specified by XUnitProjects - XUnitPublishTargetFramework: '' # optional -- framework to use to publish your xUnit projects - XUnitRuntimeTargetFramework: '' # optional -- framework to use for the xUnit console runner - XUnitRunnerVersion: '' # optional -- version of the xUnit nuget package you wish to use on Helix; required for XUnitProjects - IncludeDotNetCli: false # optional -- true will download a version of the .NET CLI onto the Helix machine as a correlation payload; requires DotNetCliPackageType and DotNetCliVersion - DotNetCliPackageType: '' # optional -- either 'sdk', 'runtime' or 'aspnetcore-runtime'; determines whether the sdk or runtime will be sent to Helix; see https://raw.githubusercontent.com/dotnet/core/main/release-notes/releases-index.json - DotNetCliVersion: '' # optional -- version of the CLI to send to Helix; based on this: https://raw.githubusercontent.com/dotnet/core/main/release-notes/releases-index.json - WaitForWorkItemCompletion: true # optional -- true will make the task wait until work items have been completed and fail the build if work items fail. False is "fire and forget." - IsExternal: false # [DEPRECATED] -- doesn't do anything, jobs are external if HelixAccessToken is empty and Creator is set - HelixBaseUri: 'https://helix.dot.net/' # optional -- sets the Helix API base URI (allows targeting https://helix.int-dot.net ) - Creator: '' # optional -- if the build is external, use this to specify who is sending the job - DisplayNamePrefix: 'Run Tests' # optional -- rename the beginning of the displayName of the steps in AzDO - condition: succeeded() # optional -- condition for step to execute; defaults to succeeded() - continueOnError: false # optional -- determines whether to continue the build if the step errors; defaults to false - steps: - - powershell: 'powershell "$env:BUILD_SOURCESDIRECTORY\eng\common\msbuild.ps1 $env:BUILD_SOURCESDIRECTORY/${{ parameters.HelixProjectPath }} /restore /p:TreatWarningsAsErrors=false ${{ parameters.HelixProjectArguments }} /t:Test /bl:$env:BUILD_SOURCESDIRECTORY\artifacts\log\$env:BuildConfig\SendToHelix.binlog"' - displayName: ${{ parameters.DisplayNamePrefix }} (Windows) - env: - BuildConfig: $(_BuildConfig) - HelixSource: ${{ parameters.HelixSource }} - HelixType: ${{ parameters.HelixType }} - HelixBuild: ${{ parameters.HelixBuild }} - HelixConfiguration: ${{ parameters.HelixConfiguration }} - HelixTargetQueues: ${{ parameters.HelixTargetQueues }} - HelixAccessToken: ${{ parameters.HelixAccessToken }} - HelixPreCommands: ${{ parameters.HelixPreCommands }} - HelixPostCommands: ${{ parameters.HelixPostCommands }} - WorkItemDirectory: ${{ parameters.WorkItemDirectory }} - WorkItemCommand: ${{ parameters.WorkItemCommand }} - WorkItemTimeout: ${{ parameters.WorkItemTimeout }} - CorrelationPayloadDirectory: ${{ parameters.CorrelationPayloadDirectory }} - XUnitProjects: ${{ parameters.XUnitProjects }} - XUnitWorkItemTimeout: ${{ parameters.XUnitWorkItemTimeout }} - XUnitPublishTargetFramework: ${{ parameters.XUnitPublishTargetFramework }} - XUnitRuntimeTargetFramework: ${{ parameters.XUnitRuntimeTargetFramework }} - XUnitRunnerVersion: ${{ parameters.XUnitRunnerVersion }} - IncludeDotNetCli: ${{ parameters.IncludeDotNetCli }} - DotNetCliPackageType: ${{ parameters.DotNetCliPackageType }} - DotNetCliVersion: ${{ parameters.DotNetCliVersion }} - WaitForWorkItemCompletion: ${{ parameters.WaitForWorkItemCompletion }} - HelixBaseUri: ${{ parameters.HelixBaseUri }} - Creator: ${{ parameters.Creator }} - SYSTEM_ACCESSTOKEN: $(System.AccessToken) - condition: and(${{ parameters.condition }}, eq(variables['Agent.Os'], 'Windows_NT')) - continueOnError: ${{ parameters.continueOnError }} - - script: $BUILD_SOURCESDIRECTORY/eng/common/msbuild.sh $BUILD_SOURCESDIRECTORY/${{ parameters.HelixProjectPath }} /restore /p:TreatWarningsAsErrors=false ${{ parameters.HelixProjectArguments }} /t:Test /bl:$BUILD_SOURCESDIRECTORY/artifacts/log/$BuildConfig/SendToHelix.binlog - displayName: ${{ parameters.DisplayNamePrefix }} (Unix) - env: - BuildConfig: $(_BuildConfig) - HelixSource: ${{ parameters.HelixSource }} - HelixType: ${{ parameters.HelixType }} - HelixBuild: ${{ parameters.HelixBuild }} - HelixConfiguration: ${{ parameters.HelixConfiguration }} - HelixTargetQueues: ${{ parameters.HelixTargetQueues }} - HelixAccessToken: ${{ parameters.HelixAccessToken }} - HelixPreCommands: ${{ parameters.HelixPreCommands }} - HelixPostCommands: ${{ parameters.HelixPostCommands }} - WorkItemDirectory: ${{ parameters.WorkItemDirectory }} - WorkItemCommand: ${{ parameters.WorkItemCommand }} - WorkItemTimeout: ${{ parameters.WorkItemTimeout }} - CorrelationPayloadDirectory: ${{ parameters.CorrelationPayloadDirectory }} - XUnitProjects: ${{ parameters.XUnitProjects }} - XUnitWorkItemTimeout: ${{ parameters.XUnitWorkItemTimeout }} - XUnitPublishTargetFramework: ${{ parameters.XUnitPublishTargetFramework }} - XUnitRuntimeTargetFramework: ${{ parameters.XUnitRuntimeTargetFramework }} - XUnitRunnerVersion: ${{ parameters.XUnitRunnerVersion }} - IncludeDotNetCli: ${{ parameters.IncludeDotNetCli }} - DotNetCliPackageType: ${{ parameters.DotNetCliPackageType }} - DotNetCliVersion: ${{ parameters.DotNetCliVersion }} - WaitForWorkItemCompletion: ${{ parameters.WaitForWorkItemCompletion }} - HelixBaseUri: ${{ parameters.HelixBaseUri }} - Creator: ${{ parameters.Creator }} - SYSTEM_ACCESSTOKEN: $(System.AccessToken) - condition: and(${{ parameters.condition }}, ne(variables['Agent.Os'], 'Windows_NT')) - continueOnError: ${{ parameters.continueOnError }} +- template: /eng/common/core-templates/steps/send-to-helix.yml + parameters: + is1ESPipeline: true + + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/eng/common/templates-official/steps/source-build.yml b/eng/common/templates-official/steps/source-build.yml index 53ed57b6d48..8f92c49e7b0 100644 --- a/eng/common/templates-official/steps/source-build.yml +++ b/eng/common/templates-official/steps/source-build.yml @@ -1,131 +1,7 @@ -parameters: - # This template adds arcade-powered source-build to CI. - - # This is a 'steps' template, and is intended for advanced scenarios where the existing build - # infra has a careful build methodology that must be followed. For example, a repo - # (dotnet/runtime) might choose to clone the GitHub repo only once and store it as a pipeline - # artifact for all subsequent jobs to use, to reduce dependence on a strong network connection to - # GitHub. Using this steps template leaves room for that infra to be included. - - # Defines the platform on which to run the steps. See 'eng/common/templates-official/job/source-build.yml' - # for details. The entire object is described in the 'job' template for simplicity, even though - # the usage of the properties on this object is split between the 'job' and 'steps' templates. - platform: {} - steps: -# Build. Keep it self-contained for simple reusability. (No source-build-specific job variables.) -- script: | - set -x - df -h - - # If building on the internal project, the artifact feeds variable may be available (usually only if needed) - # In that case, call the feed setup script to add internal feeds corresponding to public ones. - # In addition, add an msbuild argument to copy the WIP from the repo to the target build location. - # This is because SetupNuGetSources.sh will alter the current NuGet.config file, and we need to preserve those - # changes. - internalRestoreArgs= - if [ '$(dn-bot-dnceng-artifact-feeds-rw)' != '$''(dn-bot-dnceng-artifact-feeds-rw)' ]; then - # Temporarily work around https://github.com/dotnet/arcade/issues/7709 - chmod +x $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh - $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh $(Build.SourcesDirectory)/NuGet.config $(dn-bot-dnceng-artifact-feeds-rw) - internalRestoreArgs='/p:CopyWipIntoInnerSourceBuildRepo=true' - - # The 'Copy WIP' feature of source build uses git stash to apply changes from the original repo. - # This only works if there is a username/email configured, which won't be the case in most CI runs. - git config --get user.email - if [ $? -ne 0 ]; then - git config user.email dn-bot@microsoft.com - git config user.name dn-bot - fi - fi - - # If building on the internal project, the internal storage variable may be available (usually only if needed) - # In that case, add variables to allow the download of internal runtimes if the specified versions are not found - # in the default public locations. - internalRuntimeDownloadArgs= - if [ '$(dotnetbuilds-internal-container-read-token-base64)' != '$''(dotnetbuilds-internal-container-read-token-base64)' ]; then - internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) --runtimesourcefeed https://dotnetbuilds.blob.core.windows.net/internal --runtimesourcefeedkey $(dotnetbuilds-internal-container-read-token-base64)' - fi - - buildConfig=Release - # Check if AzDO substitutes in a build config from a variable, and use it if so. - if [ '$(_BuildConfig)' != '$''(_BuildConfig)' ]; then - buildConfig='$(_BuildConfig)' - fi - - officialBuildArgs= - if [ '${{ and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}' = 'True' ]; then - officialBuildArgs='/p:DotNetPublishUsingPipelines=true /p:OfficialBuildId=$(BUILD.BUILDNUMBER)' - fi - - targetRidArgs= - if [ '${{ parameters.platform.targetRID }}' != '' ]; then - targetRidArgs='/p:TargetRid=${{ parameters.platform.targetRID }}' - fi - - runtimeOsArgs= - if [ '${{ parameters.platform.runtimeOS }}' != '' ]; then - runtimeOsArgs='/p:RuntimeOS=${{ parameters.platform.runtimeOS }}' - fi - - baseOsArgs= - if [ '${{ parameters.platform.baseOS }}' != '' ]; then - baseOsArgs='/p:BaseOS=${{ parameters.platform.baseOS }}' - fi - - publishArgs= - if [ '${{ parameters.platform.skipPublishValidation }}' != 'true' ]; then - publishArgs='--publish' - fi - - assetManifestFileName=SourceBuild_RidSpecific.xml - if [ '${{ parameters.platform.name }}' != '' ]; then - assetManifestFileName=SourceBuild_${{ parameters.platform.name }}.xml - fi - - ${{ coalesce(parameters.platform.buildScript, './build.sh') }} --ci \ - --configuration $buildConfig \ - --restore --build --pack $publishArgs -bl \ - $officialBuildArgs \ - $internalRuntimeDownloadArgs \ - $internalRestoreArgs \ - $targetRidArgs \ - $runtimeOsArgs \ - $baseOsArgs \ - /p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \ - /p:ArcadeBuildFromSource=true \ - /p:DotNetBuildSourceOnly=true \ - /p:DotNetBuildRepo=true \ - /p:AssetManifestFileName=$assetManifestFileName - displayName: Build - -# Upload build logs for diagnosis. -- task: CopyFiles@2 - displayName: Prepare BuildLogs staging directory - inputs: - SourceFolder: '$(Build.SourcesDirectory)' - Contents: | - **/*.log - **/*.binlog - artifacts/sb/prebuilt-report/** - TargetFolder: '$(Build.StagingDirectory)/BuildLogs' - CleanTargetFolder: true - continueOnError: true - condition: succeededOrFailed() - -- task: 1ES.PublishPipelineArtifact@1 - displayName: Publish BuildLogs - inputs: - targetPath: '$(Build.StagingDirectory)/BuildLogs' - artifactName: BuildLogs_SourceBuild_${{ parameters.platform.name }}_Attempt$(System.JobAttempt) - continueOnError: true - condition: succeededOrFailed() +- template: /eng/common/core-templates/steps/source-build.yml + parameters: + is1ESPipeline: true -# Manually inject component detection so that we can ignore the source build upstream cache, which contains -# a nupkg cache of input packages (a local feed). -# This path must match the upstream cache path in property 'CurrentRepoSourceBuiltNupkgCacheDir' -# in src\Microsoft.DotNet.Arcade.Sdk\tools\SourceBuild\SourceBuildArcade.targets -- task: ComponentGovernanceComponentDetection@0 - displayName: Component Detection (Exclude upstream cache) - inputs: - ignoreDirectories: '$(Build.SourcesDirectory)/artifacts/sb/src/artifacts/obj/source-built-upstream-cache' + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml deleted file mode 100644 index 7870f93bc17..00000000000 --- a/eng/common/templates/job/execute-sdl.yml +++ /dev/null @@ -1,139 +0,0 @@ -parameters: - enable: 'false' # Whether the SDL validation job should execute or not - overrideParameters: '' # Optional: to override values for parameters. - additionalParameters: '' # Optional: parameters that need user specific values eg: '-SourceToolsList @("abc","def") -ArtifactToolsList @("ghi","jkl")' - # Optional: if specified, restore and use this version of Guardian instead of the default. - overrideGuardianVersion: '' - # Optional: if true, publish the '.gdn' folder as a pipeline artifact. This can help with in-depth - # diagnosis of problems with specific tool configurations. - publishGuardianDirectoryToPipeline: false - # The script to run to execute all SDL tools. Use this if you want to use a script to define SDL - # parameters rather than relying on YAML. It may be better to use a local script, because you can - # reproduce results locally without piecing together a command based on the YAML. - executeAllSdlToolsScript: 'eng/common/sdl/execute-all-sdl-tools.ps1' - # There is some sort of bug (has been reported) in Azure DevOps where if this parameter is named - # 'continueOnError', the parameter value is not correctly picked up. - # This can also be remedied by the caller (post-build.yml) if it does not use a nested parameter - sdlContinueOnError: false # optional: determines whether to continue the build if the step errors; - # optional: determines if build artifacts should be downloaded. - downloadArtifacts: true - # optional: determines if this job should search the directory of downloaded artifacts for - # 'tar.gz' and 'zip' archive files and extract them before running SDL validation tasks. - extractArchiveArtifacts: false - dependsOn: '' # Optional: dependencies of the job - artifactNames: '' # Optional: patterns supplied to DownloadBuildArtifacts - # Usage: - # artifactNames: - # - 'BlobArtifacts' - # - 'Artifacts_Windows_NT_Release' - # Optional: download a list of pipeline artifacts. 'downloadArtifacts' controls build artifacts, - # not pipeline artifacts, so doesn't affect the use of this parameter. - pipelineArtifactNames: [] - -jobs: -- job: Run_SDL - dependsOn: ${{ parameters.dependsOn }} - displayName: Run SDL tool - condition: and(succeededOrFailed(), eq( ${{ parameters.enable }}, 'true')) - variables: - - group: DotNet-VSTS-Bot - - name: AzDOProjectName - value: ${{ parameters.AzDOProjectName }} - - name: AzDOPipelineId - value: ${{ parameters.AzDOPipelineId }} - - name: AzDOBuildId - value: ${{ parameters.AzDOBuildId }} - - template: /eng/common/templates/variables/sdl-variables.yml - - name: GuardianVersion - value: ${{ coalesce(parameters.overrideGuardianVersion, '$(DefaultGuardianVersion)') }} - - template: /eng/common/templates/variables/pool-providers.yml - pool: - # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) - ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: - name: VSEngSS-MicroBuild2022-1ES - demands: Cmd - # If it's not devdiv, it's dnceng - ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: - name: $(DncEngInternalBuildPool) - demands: ImageOverride -equals windows.vs2019.amd64 - steps: - - checkout: self - clean: true - - # If the template caller didn't provide an AzDO parameter, set them all up as Maestro vars. - - ${{ if not(and(parameters.AzDOProjectName, parameters.AzDOPipelineId, parameters.AzDOBuildId)) }}: - - template: /eng/common/templates/post-build/setup-maestro-vars.yml - - - ${{ if ne(parameters.downloadArtifacts, 'false')}}: - - ${{ if ne(parameters.artifactNames, '') }}: - - ${{ each artifactName in parameters.artifactNames }}: - - task: DownloadBuildArtifacts@0 - displayName: Download Build Artifacts - inputs: - buildType: specific - buildVersionToDownload: specific - project: $(AzDOProjectName) - pipeline: $(AzDOPipelineId) - buildId: $(AzDOBuildId) - artifactName: ${{ artifactName }} - downloadPath: $(Build.ArtifactStagingDirectory)\artifacts - checkDownloadedFiles: true - - ${{ if eq(parameters.artifactNames, '') }}: - - task: DownloadBuildArtifacts@0 - displayName: Download Build Artifacts - inputs: - buildType: specific - buildVersionToDownload: specific - project: $(AzDOProjectName) - pipeline: $(AzDOPipelineId) - buildId: $(AzDOBuildId) - downloadType: specific files - itemPattern: "**" - downloadPath: $(Build.ArtifactStagingDirectory)\artifacts - checkDownloadedFiles: true - - - ${{ each artifactName in parameters.pipelineArtifactNames }}: - - task: DownloadPipelineArtifact@2 - displayName: Download Pipeline Artifacts - inputs: - buildType: specific - buildVersionToDownload: specific - project: $(AzDOProjectName) - pipeline: $(AzDOPipelineId) - buildId: $(AzDOBuildId) - artifactName: ${{ artifactName }} - downloadPath: $(Build.ArtifactStagingDirectory)\artifacts - checkDownloadedFiles: true - - - powershell: eng/common/sdl/trim-assets-version.ps1 - -InputPath $(Build.ArtifactStagingDirectory)\artifacts - displayName: Trim the version from the NuGet packages - continueOnError: ${{ parameters.sdlContinueOnError }} - - - powershell: eng/common/sdl/extract-artifact-packages.ps1 - -InputPath $(Build.ArtifactStagingDirectory)\artifacts\BlobArtifacts - -ExtractPath $(Build.ArtifactStagingDirectory)\artifacts\BlobArtifacts - displayName: Extract Blob Artifacts - continueOnError: ${{ parameters.sdlContinueOnError }} - - - powershell: eng/common/sdl/extract-artifact-packages.ps1 - -InputPath $(Build.ArtifactStagingDirectory)\artifacts\PackageArtifacts - -ExtractPath $(Build.ArtifactStagingDirectory)\artifacts\PackageArtifacts - displayName: Extract Package Artifacts - continueOnError: ${{ parameters.sdlContinueOnError }} - - - ${{ if ne(parameters.extractArchiveArtifacts, 'false') }}: - - powershell: eng/common/sdl/extract-artifact-archives.ps1 - -InputPath $(Build.ArtifactStagingDirectory)\artifacts - -ExtractPath $(Build.ArtifactStagingDirectory)\artifacts - displayName: Extract Archive Artifacts - continueOnError: ${{ parameters.sdlContinueOnError }} - - - template: /eng/common/templates/steps/execute-sdl.yml - parameters: - overrideGuardianVersion: ${{ parameters.overrideGuardianVersion }} - executeAllSdlToolsScript: ${{ parameters.executeAllSdlToolsScript }} - overrideParameters: ${{ parameters.overrideParameters }} - additionalParameters: ${{ parameters.additionalParameters }} - publishGuardianDirectoryToPipeline: ${{ parameters.publishGuardianDirectoryToPipeline }} - sdlContinueOnError: ${{ parameters.sdlContinueOnError }} diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index a3277bf15c5..fca89ff2e06 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -1,259 +1,58 @@ -# Internal resources (telemetry, microbuild) can only be accessed from non-public projects, -# and some (Microbuild) should only be applied to non-PR cases for internal builds. - -parameters: -# Job schema parameters - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#job - cancelTimeoutInMinutes: '' - condition: '' - container: '' - continueOnError: false - dependsOn: '' - displayName: '' - pool: '' - steps: [] - strategy: '' - timeoutInMinutes: '' - variables: [] - workspace: '' - templateContext: '' - -# Job base template specific parameters - # See schema documentation - https://github.com/dotnet/arcade/blob/master/Documentation/AzureDevOps/TemplateSchema.md - artifacts: '' - enableMicrobuild: false - enablePublishBuildArtifacts: false - enablePublishBuildAssets: false - enablePublishTestResults: false - enablePublishUsingPipelines: false - enableBuildRetry: false - disableComponentGovernance: '' - componentGovernanceIgnoreDirectories: '' - mergeTestResults: false - testRunTitle: '' - testResultsFormat: '' - name: '' - preSteps: [] - runAsPublic: false -# Sbom related params - enableSbom: true - PackageVersion: 7.0.0 - BuildDropPath: '$(Build.SourcesDirectory)/artifacts' - jobs: -- job: ${{ parameters.name }} - - ${{ if ne(parameters.cancelTimeoutInMinutes, '') }}: - cancelTimeoutInMinutes: ${{ parameters.cancelTimeoutInMinutes }} - - ${{ if ne(parameters.condition, '') }}: - condition: ${{ parameters.condition }} - - ${{ if ne(parameters.container, '') }}: - container: ${{ parameters.container }} - - ${{ if ne(parameters.continueOnError, '') }}: - continueOnError: ${{ parameters.continueOnError }} - - ${{ if ne(parameters.dependsOn, '') }}: - dependsOn: ${{ parameters.dependsOn }} - - ${{ if ne(parameters.displayName, '') }}: - displayName: ${{ parameters.displayName }} - - ${{ if ne(parameters.pool, '') }}: - pool: ${{ parameters.pool }} - - ${{ if ne(parameters.strategy, '') }}: - strategy: ${{ parameters.strategy }} - - ${{ if ne(parameters.timeoutInMinutes, '') }}: - timeoutInMinutes: ${{ parameters.timeoutInMinutes }} - - ${{ if ne(parameters.templateContext, '') }}: - templateContext: ${{ parameters.templateContext }} - - variables: - - ${{ if ne(parameters.enableTelemetry, 'false') }}: - - name: DOTNET_CLI_TELEMETRY_PROFILE - value: '$(Build.Repository.Uri)' - - ${{ if eq(parameters.enableRichCodeNavigation, 'true') }}: - - name: EnableRichCodeNavigation - value: 'true' - # Retry signature validation up to three times, waiting 2 seconds between attempts. - # See https://learn.microsoft.com/en-us/nuget/reference/errors-and-warnings/nu3028#retry-untrusted-root-failures - - name: NUGET_EXPERIMENTAL_CHAIN_BUILD_RETRY_POLICY - value: 3,2000 - - ${{ each variable in parameters.variables }}: - # handle name-value variable syntax - # example: - # - name: [key] - # value: [value] - - ${{ if ne(variable.name, '') }}: - - name: ${{ variable.name }} - value: ${{ variable.value }} - - # handle variable groups - - ${{ if ne(variable.group, '') }}: - - group: ${{ variable.group }} - - # handle template variable syntax - # example: - # - template: path/to/template.yml - # parameters: - # [key]: [value] - - ${{ if ne(variable.template, '') }}: - - template: ${{ variable.template }} - ${{ if ne(variable.parameters, '') }}: - parameters: ${{ variable.parameters }} - - # handle key-value variable syntax. - # example: - # - [key]: [value] - - ${{ if and(eq(variable.name, ''), eq(variable.group, ''), eq(variable.template, '')) }}: - - ${{ each pair in variable }}: - - name: ${{ pair.key }} - value: ${{ pair.value }} - - # DotNet-HelixApi-Access provides 'HelixApiAccessToken' for internal builds - - ${{ if and(eq(parameters.enableTelemetry, 'true'), eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - group: DotNet-HelixApi-Access - - ${{ if ne(parameters.workspace, '') }}: - workspace: ${{ parameters.workspace }} - - steps: - - ${{ if ne(parameters.preSteps, '') }}: - - ${{ each preStep in parameters.preSteps }}: - - ${{ preStep }} - - - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - ${{ if eq(parameters.enableMicrobuild, 'true') }}: - - task: MicroBuildSigningPlugin@3 - displayName: Install MicroBuild plugin - inputs: - signType: $(_SignType) - zipSources: false - feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json - env: - TeamName: $(_TeamName) - continueOnError: ${{ parameters.continueOnError }} - 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@1 - - - ${{ if and(ne(parameters.artifacts.download, 'false'), ne(parameters.artifacts.download, '')) }}: - - task: DownloadPipelineArtifact@2 - inputs: - buildType: current - artifactName: ${{ coalesce(parameters.artifacts.download.name, 'Artifacts_$(Agent.OS)_$(_BuildConfig)') }} - targetPath: ${{ coalesce(parameters.artifacts.download.path, 'artifacts') }} - itemPattern: ${{ coalesce(parameters.artifacts.download.pattern, '**') }} - - - ${{ each step in parameters.steps }}: - - ${{ step }} - - - ${{ if eq(parameters.enableRichCodeNavigation, true) }}: - - task: RichCodeNavIndexer@0 - displayName: RichCodeNav Upload - inputs: - languages: ${{ coalesce(parameters.richCodeNavigationLanguage, 'csharp') }} - environment: ${{ coalesce(parameters.richCodeNavigationEnvironment, 'internal') }} - richNavLogOutputDirectory: $(Build.SourcesDirectory)/artifacts/bin - uploadRichNavArtifacts: ${{ coalesce(parameters.richCodeNavigationUploadArtifacts, false) }} - continueOnError: true - - - template: /eng/common/templates/steps/component-governance.yml - parameters: - ${{ if eq(parameters.disableComponentGovernance, '') }}: - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.runAsPublic, 'false'), or(startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/dotnet/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/microsoft/'), eq(variables['Build.SourceBranch'], 'refs/heads/main'))) }}: - disableComponentGovernance: false - ${{ else }}: - disableComponentGovernance: true - ${{ else }}: - disableComponentGovernance: ${{ parameters.disableComponentGovernance }} - componentGovernanceIgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }} - - - ${{ if eq(parameters.enableMicrobuild, 'true') }}: - - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - task: MicroBuildCleanup@1 - displayName: Execute Microbuild cleanup tasks - condition: and(always(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT')) - continueOnError: ${{ parameters.continueOnError }} - env: - TeamName: $(_TeamName) - - - ${{ if ne(parameters.artifacts.publish, '') }}: - - ${{ if and(ne(parameters.artifacts.publish.artifacts, 'false'), ne(parameters.artifacts.publish.artifacts, '')) }}: - - task: CopyFiles@2 - displayName: Gather binaries for publish to artifacts - inputs: - SourceFolder: 'artifacts/bin' - Contents: '**' - TargetFolder: '$(Build.ArtifactStagingDirectory)/artifacts/bin' - - task: CopyFiles@2 - displayName: Gather packages for publish to artifacts - inputs: - SourceFolder: 'artifacts/packages' - Contents: '**' - TargetFolder: '$(Build.ArtifactStagingDirectory)/artifacts/packages' - - task: PublishBuildArtifacts@1 - displayName: Publish pipeline artifacts - inputs: - PathtoPublish: '$(Build.ArtifactStagingDirectory)/artifacts' - PublishLocation: Container - ArtifactName: ${{ coalesce(parameters.artifacts.publish.artifacts.name , 'Artifacts_$(Agent.Os)_$(_BuildConfig)') }} - continueOnError: true - condition: always() - - ${{ if and(ne(parameters.artifacts.publish.logs, 'false'), ne(parameters.artifacts.publish.logs, '')) }}: - - publish: artifacts/log - artifact: ${{ coalesce(parameters.artifacts.publish.logs.name, 'Logs_Build_$(Agent.Os)_$(_BuildConfig)') }} - displayName: Publish logs - continueOnError: true - condition: always() - - - ${{ if ne(parameters.enablePublishBuildArtifacts, 'false') }}: - - task: PublishBuildArtifacts@1 - displayName: Publish Logs - inputs: - PathtoPublish: '$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)' - PublishLocation: Container - ArtifactName: ${{ coalesce(parameters.enablePublishBuildArtifacts.artifactName, '$(Agent.Os)_$(Agent.JobName)' ) }} - continueOnError: true - condition: always() - - - ${{ if or(and(eq(parameters.enablePublishTestResults, 'true'), eq(parameters.testResultsFormat, '')), eq(parameters.testResultsFormat, 'xunit')) }}: - - task: PublishTestResults@2 - displayName: Publish XUnit Test Results - inputs: - testResultsFormat: 'xUnit' - testResultsFiles: '*.xml' - searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)' - testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-xunit - mergeTestResults: ${{ parameters.mergeTestResults }} - continueOnError: true - condition: always() - - ${{ if or(and(eq(parameters.enablePublishTestResults, 'true'), eq(parameters.testResultsFormat, '')), eq(parameters.testResultsFormat, 'vstest')) }}: - - task: PublishTestResults@2 - displayName: Publish TRX Test Results - inputs: - testResultsFormat: 'VSTest' - testResultsFiles: '*.trx' - searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)' - testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-trx - mergeTestResults: ${{ parameters.mergeTestResults }} - continueOnError: true - condition: always() - - - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.enableSbom, 'true')) }}: - - template: /eng/common/templates/steps/generate-sbom.yml - parameters: - PackageVersion: ${{ parameters.packageVersion}} - BuildDropPath: ${{ parameters.buildDropPath }} - IgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }} - - - ${{ if eq(parameters.enableBuildRetry, 'true') }}: - - publish: $(Build.SourcesDirectory)\eng\common\BuildConfiguration - artifact: BuildConfiguration - displayName: Publish build retry configuration - continueOnError: true +- template: /eng/common/core-templates/job/job.yml + parameters: + is1ESPipeline: false + + ${{ each parameter in parameters }}: + ${{ if and(ne(parameter.key, 'steps'), ne(parameter.key, 'is1ESPipeline')) }}: + ${{ parameter.key }}: ${{ parameter.value }} + + steps: + - ${{ each step in parameters.steps }}: + - ${{ step }} + + artifactPublishSteps: + - ${{ if ne(parameters.artifacts.publish, '') }}: + - ${{ if and(ne(parameters.artifacts.publish.artifacts, 'false'), ne(parameters.artifacts.publish.artifacts, '')) }}: + - template: /eng/common/core-templates/steps/publish-build-artifacts.yml + parameters: + is1ESPipeline: false + args: + displayName: Publish pipeline artifacts + pathToPublish: '$(Build.ArtifactStagingDirectory)/artifacts' + publishLocation: Container + artifactName: ${{ coalesce(parameters.artifacts.publish.artifacts.name , 'Artifacts_$(Agent.Os)_$(_BuildConfig)') }} + continueOnError: true + condition: always() + - ${{ if and(ne(parameters.artifacts.publish.logs, 'false'), ne(parameters.artifacts.publish.logs, '')) }}: + - template: /eng/common/core-templates/steps/publish-pipeline-artifacts.yml + parameters: + is1ESPipeline: false + args: + targetPath: '$(Build.ArtifactStagingDirectory)/artifacts/log' + artifactName: ${{ coalesce(parameters.artifacts.publish.logs.name, 'Logs_Build_$(Agent.Os)_$(_BuildConfig)') }} + displayName: 'Publish logs' + continueOnError: true + condition: always() + + - ${{ if ne(parameters.enablePublishBuildArtifacts, 'false') }}: + - template: /eng/common/core-templates/steps/publish-build-artifacts.yml + parameters: + is1ESPipeline: false + args: + displayName: Publish Logs + pathToPublish: '$(Build.ArtifactStagingDirectory)/artifacts/log/$(_BuildConfig)' + publishLocation: Container + artifactName: ${{ coalesce(parameters.enablePublishBuildArtifacts.artifactName, '$(Agent.Os)_$(Agent.JobName)' ) }} + continueOnError: true + condition: always() + + - ${{ if eq(parameters.enableBuildRetry, 'true') }}: + - template: /eng/common/core-templates/steps/publish-pipeline-artifacts.yml + parameters: + is1ESPipeline: false + args: + targetPath: '$(Build.SourcesDirectory)\eng\common\BuildConfiguration' + artifactName: 'BuildConfiguration' + displayName: 'Publish build retry configuration' + continueOnError: true diff --git a/eng/common/templates/job/onelocbuild.yml b/eng/common/templates/job/onelocbuild.yml index 60ab00c4de3..ff829dc4c70 100644 --- a/eng/common/templates/job/onelocbuild.yml +++ b/eng/common/templates/job/onelocbuild.yml @@ -1,109 +1,7 @@ -parameters: - # Optional: dependencies of the job - dependsOn: '' - - # Optional: A defined YAML pool - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#pool - pool: '' - - CeapexPat: $(dn-bot-ceapex-package-r) # PAT for the loc AzDO instance https://dev.azure.com/ceapex - GithubPat: $(BotAccount-dotnet-bot-repo-PAT) - - SourcesDirectory: $(Build.SourcesDirectory) - CreatePr: true - AutoCompletePr: false - ReusePr: true - UseLfLineEndings: true - UseCheckedInLocProjectJson: false - SkipLocProjectJsonGeneration: false - LanguageSet: VS_Main_Languages - LclSource: lclFilesInRepo - LclPackageId: '' - RepoType: gitHub - GitHubOrg: dotnet - MirrorRepo: '' - MirrorBranch: main - condition: '' - JobNameSuffix: '' - jobs: -- job: OneLocBuild${{ parameters.JobNameSuffix }} - - dependsOn: ${{ parameters.dependsOn }} - - displayName: OneLocBuild${{ parameters.JobNameSuffix }} - - variables: - - group: OneLocBuildVariables # Contains the CeapexPat and GithubPat - - name: _GenerateLocProjectArguments - value: -SourcesDirectory ${{ parameters.SourcesDirectory }} - -LanguageSet "${{ parameters.LanguageSet }}" - -CreateNeutralXlfs - - ${{ if eq(parameters.UseCheckedInLocProjectJson, 'true') }}: - - name: _GenerateLocProjectArguments - value: ${{ variables._GenerateLocProjectArguments }} -UseCheckedInLocProjectJson - - template: /eng/common/templates/variables/pool-providers.yml - - ${{ if ne(parameters.pool, '') }}: - pool: ${{ parameters.pool }} - ${{ if eq(parameters.pool, '') }}: - pool: - # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) - ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: - name: VSEngSS-MicroBuild2022-1ES - demands: Cmd - # If it's not devdiv, it's dnceng - ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: - name: $(DncEngInternalBuildPool) - demands: ImageOverride -equals windows.vs2019.amd64 - - steps: - - ${{ if ne(parameters.SkipLocProjectJsonGeneration, 'true') }}: - - task: Powershell@2 - inputs: - filePath: $(Build.SourcesDirectory)/eng/common/generate-locproject.ps1 - arguments: $(_GenerateLocProjectArguments) - displayName: Generate LocProject.json - condition: ${{ parameters.condition }} - - - task: OneLocBuild@2 - displayName: OneLocBuild - env: - SYSTEM_ACCESSTOKEN: $(System.AccessToken) - inputs: - locProj: eng/Localize/LocProject.json - outDir: $(Build.ArtifactStagingDirectory) - lclSource: ${{ parameters.LclSource }} - lclPackageId: ${{ parameters.LclPackageId }} - isCreatePrSelected: ${{ parameters.CreatePr }} - isAutoCompletePrSelected: ${{ parameters.AutoCompletePr }} - ${{ if eq(parameters.CreatePr, true) }}: - isUseLfLineEndingsSelected: ${{ parameters.UseLfLineEndings }} - ${{ if eq(parameters.RepoType, 'gitHub') }}: - isShouldReusePrSelected: ${{ parameters.ReusePr }} - packageSourceAuth: patAuth - patVariable: ${{ parameters.CeapexPat }} - ${{ if eq(parameters.RepoType, 'gitHub') }}: - repoType: ${{ parameters.RepoType }} - gitHubPatVariable: "${{ parameters.GithubPat }}" - ${{ if ne(parameters.MirrorRepo, '') }}: - isMirrorRepoSelected: true - gitHubOrganization: ${{ parameters.GitHubOrg }} - mirrorRepo: ${{ parameters.MirrorRepo }} - mirrorBranch: ${{ parameters.MirrorBranch }} - condition: ${{ parameters.condition }} - - - task: PublishBuildArtifacts@1 - displayName: Publish Localization Files - inputs: - PathtoPublish: '$(Build.ArtifactStagingDirectory)/loc' - PublishLocation: Container - ArtifactName: Loc - condition: ${{ parameters.condition }} +- template: /eng/common/core-templates/job/onelocbuild.yml + parameters: + is1ESPipeline: false - - task: PublishBuildArtifacts@1 - displayName: Publish LocProject.json - inputs: - PathtoPublish: '$(Build.SourcesDirectory)/eng/Localize/' - PublishLocation: Container - ArtifactName: Loc - condition: ${{ parameters.condition }} \ No newline at end of file + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml index bb42240f865..ab2edec2adb 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -1,155 +1,7 @@ -parameters: - configuration: 'Debug' - - # Optional: condition for the job to run - condition: '' - - # Optional: 'true' if future jobs should run even if this job fails - continueOnError: false - - # Optional: dependencies of the job - dependsOn: '' - - # Optional: Include PublishBuildArtifacts task - enablePublishBuildArtifacts: false - - # Optional: A defined YAML pool - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#pool - pool: {} - - # Optional: should run as a public build even in the internal project - # if 'true', the build won't run any of the internal only steps, even if it is running in non-public projects. - runAsPublic: false - - # Optional: whether the build's artifacts will be published using release pipelines or direct feed publishing - publishUsingPipelines: false - - # Optional: whether the build's artifacts will be published using release pipelines or direct feed publishing - publishAssetsImmediately: false - - artifactsPublishingAdditionalParameters: '' - - signingValidationAdditionalParameters: '' - jobs: -- job: Asset_Registry_Publish - - dependsOn: ${{ parameters.dependsOn }} - timeoutInMinutes: 150 - - ${{ if eq(parameters.publishAssetsImmediately, 'true') }}: - displayName: Publish Assets - ${{ else }}: - displayName: Publish to Build Asset Registry - - variables: - - template: /eng/common/templates/variables/pool-providers.yml - - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - group: Publish-Build-Assets - - group: AzureDevOps-Artifact-Feeds-Pats - - name: runCodesignValidationInjection - value: false - # unconditional - needed for logs publishing (redactor tool version) - - template: /eng/common/templates/post-build/common-variables.yml - - pool: - # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) - ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: - name: VSEngSS-MicroBuild2022-1ES - demands: Cmd - # If it's not devdiv, it's dnceng - ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: - name: NetCore1ESPool-Publishing-Internal - demands: ImageOverride -equals windows.vs2019.amd64 - - 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: - artifactName: AssetManifests - downloadPath: '$(Build.StagingDirectory)/Download' - checkDownloadedFiles: true - condition: ${{ parameters.condition }} - continueOnError: ${{ parameters.continueOnError }} - - - task: NuGetAuthenticate@1 - - - task: PowerShell@2 - displayName: Publish Build Assets - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishBuildAssets -restore -msbuildEngine dotnet - /p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests' - /p:BuildAssetRegistryToken=$(MaestroAccessToken) - /p:MaestroApiEndpoint=https://maestro.dot.net - /p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }} - /p:OfficialBuildId=$(Build.BuildNumber) - condition: ${{ parameters.condition }} - continueOnError: ${{ parameters.continueOnError }} - - - task: powershell@2 - displayName: Create ReleaseConfigs Artifact - inputs: - targetType: inline - script: | - Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value $(BARBuildId) - Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value "$(DefaultChannels)" - Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value $(IsStableBuild) - - - task: PublishBuildArtifacts@1 - displayName: Publish ReleaseConfigs Artifact - inputs: - PathtoPublish: '$(Build.StagingDirectory)/ReleaseConfigs.txt' - PublishLocation: Container - ArtifactName: ReleaseConfigs - - - task: powershell@2 - displayName: Check if SymbolPublishingExclusionsFile.txt exists - inputs: - targetType: inline - script: | - $symbolExclusionfile = "$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt" - if(Test-Path -Path $symbolExclusionfile) - { - Write-Host "SymbolExclusionFile exists" - Write-Host "##vso[task.setvariable variable=SymbolExclusionFile]true" - } - else{ - Write-Host "Symbols Exclusion file does not exists" - Write-Host "##vso[task.setvariable variable=SymbolExclusionFile]false" - } - - - task: PublishBuildArtifacts@1 - displayName: Publish SymbolPublishingExclusionsFile Artifact - condition: eq(variables['SymbolExclusionFile'], 'true') - inputs: - PathtoPublish: '$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' - PublishLocation: Container - ArtifactName: ReleaseConfigs - - - ${{ if eq(parameters.publishAssetsImmediately, 'true') }}: - - template: /eng/common/templates/post-build/setup-maestro-vars.yml - parameters: - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - - - task: PowerShell@2 - displayName: Publish Using Darc - inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 - arguments: -BuildId $(BARBuildId) - -PublishingInfraVersion 3 - -AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)' - -MaestroToken '$(MaestroApiAccessToken)' - -WaitPublishingFinish true - -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' - -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' +- template: /eng/common/core-templates/job/publish-build-assets.yml + parameters: + is1ESPipeline: false - - ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}: - - template: /eng/common/templates/steps/publish-logs.yml - parameters: - JobLabel: 'Publish_Artifacts_Logs' + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/eng/common/templates/job/source-build.yml b/eng/common/templates/job/source-build.yml index d7ed209494c..e44d47b1d76 100644 --- a/eng/common/templates/job/source-build.yml +++ b/eng/common/templates/job/source-build.yml @@ -1,66 +1,7 @@ -parameters: - # This template adds arcade-powered source-build to CI. The template produces a server job with a - # default ID 'Source_Build_Complete' to put in a dependency list if necessary. - - # Specifies the prefix for source-build jobs added to pipeline. Use this if disambiguation needed. - jobNamePrefix: 'Source_Build' - - # Defines the platform on which to run the job. By default, a linux-x64 machine, suitable for - # managed-only repositories. This is an object with these properties: - # - # name: '' - # The name of the job. This is included in the job ID. - # targetRID: '' - # The name of the target RID to use, instead of the one auto-detected by Arcade. - # nonPortable: false - # Enables non-portable mode. This means a more specific RID (e.g. fedora.32-x64 rather than - # linux-x64), and compiling against distro-provided packages rather than portable ones. - # skipPublishValidation: false - # Disables publishing validation. By default, a check is performed to ensure no packages are - # published by source-build. - # container: '' - # A container to use. Runs in docker. - # pool: {} - # A pool to use. Runs directly on an agent. - # buildScript: '' - # Specifies the build script to invoke to perform the build in the repo. The default - # './build.sh' should work for typical Arcade repositories, but this is customizable for - # difficult situations. - # jobProperties: {} - # A list of job properties to inject at the top level, for potential extensibility beyond - # container and pool. - platform: {} - jobs: -- job: ${{ parameters.jobNamePrefix }}_${{ parameters.platform.name }} - displayName: Source-Build (${{ parameters.platform.name }}) - - ${{ each property in parameters.platform.jobProperties }}: - ${{ property.key }}: ${{ property.value }} - - ${{ if ne(parameters.platform.container, '') }}: - container: ${{ parameters.platform.container }} - - ${{ if eq(parameters.platform.pool, '') }}: - # The default VM host AzDO pool. This should be capable of running Docker containers: almost all - # source-build builds run in Docker, including the default managed platform. - # /eng/common/templates/variables/pool-providers.yml can't be used here (some customers declare variables already), so duplicate its logic - pool: - ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore-Svc-Public' ), False, 'NetCore-Public')] - demands: ImageOverride -equals Build.Ubuntu.2204.Amd64.Open - - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')] - demands: ImageOverride -equals Build.Ubuntu.2204.Amd64 - - ${{ if ne(parameters.platform.pool, '') }}: - pool: ${{ parameters.platform.pool }} - - workspace: - clean: all +- template: /eng/common/core-templates/job/source-build.yml + parameters: + is1ESPipeline: false - steps: - - template: /eng/common/templates/steps/source-build.yml - parameters: - platform: ${{ parameters.platform }} + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/eng/common/templates/job/source-index-stage1.yml b/eng/common/templates/job/source-index-stage1.yml index b5a3e5c4a6c..89f3291593c 100644 --- a/eng/common/templates/job/source-index-stage1.yml +++ b/eng/common/templates/job/source-index-stage1.yml @@ -1,67 +1,7 @@ -parameters: - runAsPublic: false - sourceIndexPackageVersion: 1.0.1-20240129.2 - 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: [] - binlogPath: artifacts/log/Debug/Build.binlog - condition: '' - dependsOn: '' - pool: '' - jobs: -- job: SourceIndexStage1 - dependsOn: ${{ parameters.dependsOn }} - condition: ${{ parameters.condition }} - variables: - - name: SourceIndexPackageVersion - value: ${{ parameters.sourceIndexPackageVersion }} - - name: SourceIndexPackageSource - value: ${{ parameters.sourceIndexPackageSource }} - - name: BinlogPath - value: ${{ parameters.binlogPath }} - - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - group: source-dot-net stage1 variables - - template: /eng/common/templates/variables/pool-providers.yml - - ${{ if ne(parameters.pool, '') }}: - pool: ${{ parameters.pool }} - ${{ if eq(parameters.pool, '') }}: - pool: - ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: $(DncEngPublicBuildPool) - demands: ImageOverride -equals windows.vs2022.amd64.open - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: $(DncEngInternalBuildPool) - demands: ImageOverride -equals windows.vs2022.amd64 - - steps: - - ${{ each preStep in parameters.preSteps }}: - - ${{ preStep }} - - - task: UseDotNet@2 - displayName: Use .NET 8 SDK - inputs: - packageType: sdk - version: 8.0.x - installationPath: $(Agent.TempDirectory)/dotnet - workingDirectory: $(Agent.TempDirectory) - - - script: | - $(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version $(SourceIndexPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools - $(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version $(SourceIndexPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools - displayName: Download Tools - # Set working directory to temp directory so 'dotnet' doesn't try to use global.json and use the repo's sdk. - workingDirectory: $(Agent.TempDirectory) - - - script: ${{ parameters.sourceIndexBuildCommand }} - displayName: Build Repository - - - script: $(Agent.TempDirectory)/.source-index/tools/BinLogToSln -i $(BinlogPath) -r $(Build.SourcesDirectory) -n $(Build.Repository.Name) -o .source-index/stage1output - displayName: Process Binlog into indexable sln +- template: /eng/common/core-templates/job/source-index-stage1.yml + parameters: + is1ESPipeline: false - - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - script: $(Agent.TempDirectory)/.source-index/tools/UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name) - displayName: Upload stage1 artifacts to source index - env: - BLOB_CONTAINER_URL: $(source-dot-net-stage1-blob-container-url) + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/eng/common/templates/jobs/codeql-build.yml b/eng/common/templates/jobs/codeql-build.yml index f7dc5ea4aaa..517f24d6a52 100644 --- a/eng/common/templates/jobs/codeql-build.yml +++ b/eng/common/templates/jobs/codeql-build.yml @@ -1,31 +1,7 @@ -parameters: - # See schema documentation in /Documentation/AzureDevOps/TemplateSchema.md - continueOnError: false - # Required: A collection of jobs to run - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#job - jobs: [] - # Optional: if specified, restore and use this version of Guardian instead of the default. - overrideGuardianVersion: '' - jobs: -- template: /eng/common/templates/jobs/jobs.yml +- template: /eng/common/core-templates/jobs/codeql-build.yml parameters: - enableMicrobuild: false - enablePublishBuildArtifacts: false - enablePublishTestResults: false - enablePublishBuildAssets: false - enablePublishUsingPipelines: false - enableTelemetry: true + is1ESPipeline: false - variables: - - group: Publish-Build-Assets - # The Guardian version specified in 'eng/common/sdl/packages.config'. This value must be kept in - # sync with the packages.config file. - - name: DefaultGuardianVersion - value: 0.109.0 - - name: GuardianPackagesConfigFile - value: $(Build.SourcesDirectory)\eng\common\sdl\packages.config - - name: GuardianVersion - value: ${{ coalesce(parameters.overrideGuardianVersion, '$(DefaultGuardianVersion)') }} - - jobs: ${{ parameters.jobs }} - + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/eng/common/templates/jobs/jobs.yml b/eng/common/templates/jobs/jobs.yml index 289bb2396ce..388e9037b3e 100644 --- a/eng/common/templates/jobs/jobs.yml +++ b/eng/common/templates/jobs/jobs.yml @@ -1,97 +1,7 @@ -parameters: - # See schema documentation in /Documentation/AzureDevOps/TemplateSchema.md - continueOnError: false - - # Optional: Include PublishBuildArtifacts task - enablePublishBuildArtifacts: false - - # Optional: Enable publishing using release pipelines - enablePublishUsingPipelines: false - - # Optional: Enable running the source-build jobs to build repo from source - enableSourceBuild: false - - # Optional: Parameters for source-build template. - # See /eng/common/templates/jobs/source-build.yml for options - sourceBuildParameters: [] - - graphFileGeneration: - # Optional: Enable generating the graph files at the end of the build - enabled: false - # Optional: Include toolset dependencies in the generated graph files - includeToolset: false - - # Required: A collection of jobs to run - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#job - jobs: [] - - # Optional: Override automatically derived dependsOn value for "publish build assets" job - publishBuildAssetsDependsOn: '' - - # Optional: Publish the assets as soon as the publish to BAR stage is complete, rather doing so in a separate stage. - publishAssetsImmediately: false - - # Optional: If using publishAssetsImmediately and additional parameters are needed, can be used to send along additional parameters (normally sent to post-build.yml) - artifactsPublishingAdditionalParameters: '' - signingValidationAdditionalParameters: '' - - # Optional: should run as a public build even in the internal project - # if 'true', the build won't run any of the internal only steps, even if it is running in non-public projects. - runAsPublic: false - - enableSourceIndex: false - sourceIndexParams: {} - -# Internal resources (telemetry, microbuild) can only be accessed from non-public projects, -# and some (Microbuild) should only be applied to non-PR cases for internal builds. - jobs: -- ${{ each job in parameters.jobs }}: - - template: ../job/job.yml - parameters: - # pass along parameters - ${{ each parameter in parameters }}: - ${{ if ne(parameter.key, 'jobs') }}: - ${{ parameter.key }}: ${{ parameter.value }} - - # pass along job properties - ${{ each property in job }}: - ${{ if ne(property.key, 'job') }}: - ${{ property.key }}: ${{ property.value }} - - name: ${{ job.job }} - -- ${{ if eq(parameters.enableSourceBuild, true) }}: - - template: /eng/common/templates/jobs/source-build.yml - parameters: - allCompletedJobId: Source_Build_Complete - ${{ each parameter in parameters.sourceBuildParameters }}: - ${{ parameter.key }}: ${{ parameter.value }} - -- ${{ if eq(parameters.enableSourceIndex, 'true') }}: - - template: ../job/source-index-stage1.yml - parameters: - runAsPublic: ${{ parameters.runAsPublic }} - ${{ each parameter in parameters.sourceIndexParams }}: - ${{ parameter.key }}: ${{ parameter.value }} - -- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - ${{ if or(eq(parameters.enablePublishBuildAssets, true), eq(parameters.artifacts.publish.manifests, 'true'), ne(parameters.artifacts.publish.manifests, '')) }}: - - template: ../job/publish-build-assets.yml - parameters: - continueOnError: ${{ parameters.continueOnError }} - dependsOn: - - ${{ if ne(parameters.publishBuildAssetsDependsOn, '') }}: - - ${{ each job in parameters.publishBuildAssetsDependsOn }}: - - ${{ job.job }} - - ${{ if eq(parameters.publishBuildAssetsDependsOn, '') }}: - - ${{ each job in parameters.jobs }}: - - ${{ job.job }} - - ${{ if eq(parameters.enableSourceBuild, true) }}: - - Source_Build_Complete +- template: /eng/common/core-templates/jobs/jobs.yml + parameters: + is1ESPipeline: false - runAsPublic: ${{ parameters.runAsPublic }} - publishUsingPipelines: ${{ parameters.enablePublishUsingPipelines }} - publishAssetsImmediately: ${{ parameters.publishAssetsImmediately }} - enablePublishBuildArtifacts: ${{ parameters.enablePublishBuildArtifacts }} - artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} - signingValidationAdditionalParameters: ${{ parameters.signingValidationAdditionalParameters }} + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/eng/common/templates/jobs/source-build.yml b/eng/common/templates/jobs/source-build.yml index da91481ff1d..818d4c326db 100644 --- a/eng/common/templates/jobs/source-build.yml +++ b/eng/common/templates/jobs/source-build.yml @@ -1,46 +1,7 @@ -parameters: - # This template adds arcade-powered source-build to CI. A job is created for each platform, as - # well as an optional server job that completes when all platform jobs complete. - - # The name of the "join" job for all source-build platforms. If set to empty string, the job is - # not included. Existing repo pipelines can use this job depend on all source-build jobs - # completing without maintaining a separate list of every single job ID: just depend on this one - # server job. By default, not included. Recommended name if used: 'Source_Build_Complete'. - allCompletedJobId: '' - - # See /eng/common/templates/job/source-build.yml - jobNamePrefix: 'Source_Build' - - # This is the default platform provided by Arcade, intended for use by a managed-only repo. - defaultManagedPlatform: - name: 'Managed' - container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9' - - # Defines the platforms on which to run build jobs. One job is created for each platform, and the - # object in this array is sent to the job template as 'platform'. If no platforms are specified, - # one job runs on 'defaultManagedPlatform'. - platforms: [] - jobs: +- template: /eng/common/core-templates/jobs/source-build.yml + parameters: + is1ESPipeline: false -- ${{ if ne(parameters.allCompletedJobId, '') }}: - - job: ${{ parameters.allCompletedJobId }} - displayName: Source-Build Complete - pool: server - dependsOn: - - ${{ each platform in parameters.platforms }}: - - ${{ parameters.jobNamePrefix }}_${{ platform.name }} - - ${{ if eq(length(parameters.platforms), 0) }}: - - ${{ parameters.jobNamePrefix }}_${{ parameters.defaultManagedPlatform.name }} - -- ${{ each platform in parameters.platforms }}: - - template: /eng/common/templates/job/source-build.yml - parameters: - jobNamePrefix: ${{ parameters.jobNamePrefix }} - platform: ${{ platform }} - -- ${{ if eq(length(parameters.platforms), 0) }}: - - template: /eng/common/templates/job/source-build.yml - parameters: - jobNamePrefix: ${{ parameters.jobNamePrefix }} - platform: ${{ parameters.defaultManagedPlatform }} + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} \ No newline at end of file diff --git a/eng/common/templates/post-build/common-variables.yml b/eng/common/templates/post-build/common-variables.yml index b9ede10bf09..7fa10587559 100644 --- a/eng/common/templates/post-build/common-variables.yml +++ b/eng/common/templates/post-build/common-variables.yml @@ -1,24 +1,8 @@ variables: - - group: Publish-Build-Assets +- template: /eng/common/core-templates/post-build/common-variables.yml + parameters: + # Specifies whether to use 1ES + is1ESPipeline: false - # Whether the build is internal or not - - name: IsInternalBuild - value: ${{ and(ne(variables['System.TeamProject'], 'public'), contains(variables['Build.SourceBranch'], 'internal')) }} - - # Default Maestro++ API Endpoint and API Version - - name: MaestroApiEndPoint - value: "https://maestro.dot.net" - - name: MaestroApiAccessToken - value: $(MaestroAccessToken) - - name: MaestroApiVersion - value: "2020-02-20" - - - name: SourceLinkCLIVersion - value: 3.0.0 - - name: SymbolToolVersion - value: 1.0.1 - - name: BinlogToolVersion - value: 1.0.11 - - - name: runCodesignValidationInjection - value: false + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} \ No newline at end of file diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index ee70e2b399c..53ede714bdd 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -1,282 +1,8 @@ -parameters: - # Which publishing infra should be used. THIS SHOULD MATCH THE VERSION ON THE BUILD MANIFEST. - # Publishing V1 is no longer supported - # Publishing V2 is no longer supported - # Publishing V3 is the default - - name: publishingInfraVersion - displayName: Which version of publishing should be used to promote the build definition? - type: number - default: 3 - values: - - 3 - - - name: BARBuildId - displayName: BAR Build Id - type: number - default: 0 - - - name: PromoteToChannelIds - displayName: Channel to promote BARBuildId to - type: string - default: '' - - - name: enableSourceLinkValidation - displayName: Enable SourceLink validation - type: boolean - default: false - - - name: enableSigningValidation - displayName: Enable signing validation - type: boolean - default: true - - - name: enableSymbolValidation - displayName: Enable symbol validation - type: boolean - default: false - - - name: enableNugetValidation - displayName: Enable NuGet validation - type: boolean - default: true - - - name: publishInstallersAndChecksums - displayName: Publish installers and checksums - type: boolean - default: true - - - name: SDLValidationParameters - type: object - default: - enable: false - publishGdn: false - continueOnError: false - params: '' - artifactNames: '' - downloadArtifacts: true - - # These parameters let the user customize the call to sdk-task.ps1 for publishing - # symbols & general artifacts as well as for signing validation - - name: symbolPublishingAdditionalParameters - displayName: Symbol publishing additional parameters - type: string - default: '' - - - name: artifactsPublishingAdditionalParameters - displayName: Artifact publishing additional parameters - type: string - default: '' - - - name: signingValidationAdditionalParameters - displayName: Signing validation additional parameters - type: string - default: '' - - # Which stages should finish execution before post-build stages start - - name: validateDependsOn - type: object - default: - - build - - - name: publishDependsOn - type: object - default: - - Validate - - # Optional: Call asset publishing rather than running in a separate stage - - name: publishAssetsImmediately - type: boolean - default: false - stages: -- ${{ if or(eq( parameters.enableNugetValidation, 'true'), eq(parameters.enableSigningValidation, 'true'), eq(parameters.enableSourceLinkValidation, 'true'), eq(parameters.SDLValidationParameters.enable, 'true')) }}: - - stage: Validate - dependsOn: ${{ parameters.validateDependsOn }} - displayName: Validate Build Assets - variables: - - template: common-variables.yml - - template: /eng/common/templates/variables/pool-providers.yml - jobs: - - job: - displayName: NuGet Validation - condition: and(succeededOrFailed(), eq( ${{ parameters.enableNugetValidation }}, 'true')) - pool: - # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) - ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: - name: VSEngSS-MicroBuild2022-1ES - demands: Cmd - # If it's not devdiv, it's dnceng - ${{ else }}: - name: $(DncEngInternalBuildPool) - demands: ImageOverride -equals windows.vs2019.amd64 - - steps: - - template: setup-maestro-vars.yml - parameters: - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - - - task: DownloadBuildArtifacts@0 - displayName: Download Package Artifacts - inputs: - buildType: specific - buildVersionToDownload: specific - project: $(AzDOProjectName) - pipeline: $(AzDOPipelineId) - buildId: $(AzDOBuildId) - artifactName: PackageArtifacts - checkDownloadedFiles: true - - - task: PowerShell@2 - displayName: Validate - inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/nuget-validation.ps1 - arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ - -ToolDestinationPath $(Agent.BuildDirectory)/Extract/ - - - job: - displayName: Signing Validation - condition: and( eq( ${{ parameters.enableSigningValidation }}, 'true'), ne( variables['PostBuildSign'], 'true')) - pool: - # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) - ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: - name: VSEngSS-MicroBuild2022-1ES - demands: Cmd - # If it's not devdiv, it's dnceng - ${{ else }}: - name: $(DncEngInternalBuildPool) - demands: ImageOverride -equals windows.vs2019.amd64 - steps: - - template: setup-maestro-vars.yml - parameters: - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - - - task: DownloadBuildArtifacts@0 - displayName: Download Package Artifacts - inputs: - buildType: specific - buildVersionToDownload: specific - project: $(AzDOProjectName) - pipeline: $(AzDOPipelineId) - buildId: $(AzDOBuildId) - artifactName: PackageArtifacts - checkDownloadedFiles: true - itemPattern: | - ** - !**/Microsoft.SourceBuild.Intermediate.*.nupkg - - # 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@1 - displayName: 'Authenticate to AzDO Feeds' - - # Signing validation will optionally work with the buildmanifest file which is downloaded from - # Azure DevOps above. - - task: PowerShell@2 - displayName: Validate - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task SigningValidation -restore -msbuildEngine vs - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts' - /p:SignCheckExclusionsFile='$(Build.SourcesDirectory)/eng/SignCheckExclusionsFile.txt' - ${{ parameters.signingValidationAdditionalParameters }} - - - template: ../steps/publish-logs.yml - parameters: - StageLabel: 'Validation' - JobLabel: 'Signing' - BinlogToolVersion: $(BinlogToolVersion) - - - job: - displayName: SourceLink Validation - condition: eq( ${{ parameters.enableSourceLinkValidation }}, 'true') - pool: - # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) - ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: - name: VSEngSS-MicroBuild2022-1ES - demands: Cmd - # If it's not devdiv, it's dnceng - ${{ else }}: - name: $(DncEngInternalBuildPool) - demands: ImageOverride -equals windows.vs2019.amd64 - steps: - - template: setup-maestro-vars.yml - parameters: - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - buildType: specific - buildVersionToDownload: specific - project: $(AzDOProjectName) - pipeline: $(AzDOPipelineId) - buildId: $(AzDOBuildId) - artifactName: BlobArtifacts - checkDownloadedFiles: true - - - task: PowerShell@2 - displayName: Validate - inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/sourcelink-validation.ps1 - arguments: -InputPath $(Build.ArtifactStagingDirectory)/BlobArtifacts/ - -ExtractPath $(Agent.BuildDirectory)/Extract/ - -GHRepoName $(Build.Repository.Name) - -GHCommit $(Build.SourceVersion) - -SourcelinkCliVersion $(SourceLinkCLIVersion) - continueOnError: true - - - template: /eng/common/templates/job/execute-sdl.yml - parameters: - enable: ${{ parameters.SDLValidationParameters.enable }} - publishGuardianDirectoryToPipeline: ${{ parameters.SDLValidationParameters.publishGdn }} - additionalParameters: ${{ parameters.SDLValidationParameters.params }} - continueOnError: ${{ parameters.SDLValidationParameters.continueOnError }} - artifactNames: ${{ parameters.SDLValidationParameters.artifactNames }} - downloadArtifacts: ${{ parameters.SDLValidationParameters.downloadArtifacts }} - -- ${{ if ne(parameters.publishAssetsImmediately, 'true') }}: - - stage: publish_using_darc - ${{ if or(eq(parameters.enableNugetValidation, 'true'), eq(parameters.enableSigningValidation, 'true'), eq(parameters.enableSourceLinkValidation, 'true'), eq(parameters.SDLValidationParameters.enable, 'true')) }}: - dependsOn: ${{ parameters.publishDependsOn }} - ${{ else }}: - dependsOn: ${{ parameters.validateDependsOn }} - displayName: Publish using Darc - variables: - - template: common-variables.yml - - template: /eng/common/templates/variables/pool-providers.yml - jobs: - - job: - displayName: Publish Using Darc - timeoutInMinutes: 120 - pool: - # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) - ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: - name: VSEngSS-MicroBuild2022-1ES - demands: Cmd - # If it's not devdiv, it's dnceng - ${{ else }}: - name: NetCore1ESPool-Publishing-Internal - demands: ImageOverride -equals windows.vs2019.amd64 - steps: - - template: setup-maestro-vars.yml - parameters: - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - - - task: NuGetAuthenticate@1 +- template: /eng/common/core-templates/post-build/post-build.yml + parameters: + # Specifies whether to use 1ES + is1ESPipeline: false - - task: PowerShell@2 - displayName: Publish Using Darc - inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 - arguments: -BuildId $(BARBuildId) - -PublishingInfraVersion ${{ parameters.publishingInfraVersion }} - -AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)' - -MaestroToken '$(MaestroApiAccessToken)' - -WaitPublishingFinish true - -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' - -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} \ No newline at end of file diff --git a/eng/common/templates/post-build/setup-maestro-vars.yml b/eng/common/templates/post-build/setup-maestro-vars.yml index 0c87f149a4a..a79fab5b441 100644 --- a/eng/common/templates/post-build/setup-maestro-vars.yml +++ b/eng/common/templates/post-build/setup-maestro-vars.yml @@ -1,70 +1,8 @@ -parameters: - BARBuildId: '' - PromoteToChannelIds: '' - steps: - - ${{ if eq(coalesce(parameters.PromoteToChannelIds, 0), 0) }}: - - task: DownloadBuildArtifacts@0 - displayName: Download Release Configs - inputs: - buildType: current - artifactName: ReleaseConfigs - checkDownloadedFiles: true - - - task: PowerShell@2 - name: setReleaseVars - displayName: Set Release Configs Vars - inputs: - targetType: inline - pwsh: true - script: | - try { - if (!$Env:PromoteToMaestroChannels -or $Env:PromoteToMaestroChannels.Trim() -eq '') { - $Content = Get-Content $(Build.StagingDirectory)/ReleaseConfigs/ReleaseConfigs.txt - - $BarId = $Content | Select -Index 0 - $Channels = $Content | Select -Index 1 - $IsStableBuild = $Content | Select -Index 2 - - $AzureDevOpsProject = $Env:System_TeamProject - $AzureDevOpsBuildDefinitionId = $Env:System_DefinitionId - $AzureDevOpsBuildId = $Env:Build_BuildId - } - else { - $buildApiEndpoint = "${Env:MaestroApiEndPoint}/api/builds/${Env:BARBuildId}?api-version=${Env:MaestroApiVersion}" - - $apiHeaders = New-Object 'System.Collections.Generic.Dictionary[[String],[String]]' - $apiHeaders.Add('Accept', 'application/json') - $apiHeaders.Add('Authorization',"Bearer ${Env:MAESTRO_API_TOKEN}") - - $buildInfo = try { Invoke-WebRequest -Method Get -Uri $buildApiEndpoint -Headers $apiHeaders | ConvertFrom-Json } catch { Write-Host "Error: $_" } - - $BarId = $Env:BARBuildId - $Channels = $Env:PromoteToMaestroChannels -split "," - $Channels = $Channels -join "][" - $Channels = "[$Channels]" - - $IsStableBuild = $buildInfo.stable - $AzureDevOpsProject = $buildInfo.azureDevOpsProject - $AzureDevOpsBuildDefinitionId = $buildInfo.azureDevOpsBuildDefinitionId - $AzureDevOpsBuildId = $buildInfo.azureDevOpsBuildId - } - - Write-Host "##vso[task.setvariable variable=BARBuildId]$BarId" - Write-Host "##vso[task.setvariable variable=TargetChannels]$Channels" - Write-Host "##vso[task.setvariable variable=IsStableBuild]$IsStableBuild" +- template: /eng/common/core-templates/post-build/setup-maestro-vars.yml + parameters: + # Specifies whether to use 1ES + is1ESPipeline: false - Write-Host "##vso[task.setvariable variable=AzDOProjectName]$AzureDevOpsProject" - Write-Host "##vso[task.setvariable variable=AzDOPipelineId]$AzureDevOpsBuildDefinitionId" - Write-Host "##vso[task.setvariable variable=AzDOBuildId]$AzureDevOpsBuildId" - } - catch { - Write-Host $_ - Write-Host $_.Exception - Write-Host $_.ScriptStackTrace - exit 1 - } - env: - MAESTRO_API_TOKEN: $(MaestroApiAccessToken) - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToMaestroChannels: ${{ parameters.PromoteToChannelIds }} + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} \ No newline at end of file diff --git a/eng/common/templates/steps/add-build-to-channel.yml b/eng/common/templates/steps/add-build-to-channel.yml index f67a210d62f..42bbba161b9 100644 --- a/eng/common/templates/steps/add-build-to-channel.yml +++ b/eng/common/templates/steps/add-build-to-channel.yml @@ -1,13 +1,7 @@ -parameters: - ChannelId: 0 - steps: -- task: PowerShell@2 - displayName: Add Build to Channel - inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/add-build-to-channel.ps1 - arguments: -BuildId $(BARBuildId) - -ChannelId ${{ parameters.ChannelId }} - -MaestroApiAccessToken $(MaestroApiAccessToken) - -MaestroApiEndPoint $(MaestroApiEndPoint) - -MaestroApiVersion $(MaestroApiVersion) +- template: /eng/common/core-templates/steps/add-build-to-channel.yml + parameters: + is1ESPipeline: false + + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/eng/common/templates/steps/build-reason.yml b/eng/common/templates/steps/build-reason.yml deleted file mode 100644 index eba58109b52..00000000000 --- a/eng/common/templates/steps/build-reason.yml +++ /dev/null @@ -1,12 +0,0 @@ -# build-reason.yml -# Description: runs steps if build.reason condition is valid. conditions is a string of valid build reasons -# to include steps (',' separated). -parameters: - conditions: '' - steps: [] - -steps: - - ${{ if and( not(startsWith(parameters.conditions, 'not')), contains(parameters.conditions, variables['build.reason'])) }}: - - ${{ parameters.steps }} - - ${{ if and( startsWith(parameters.conditions, 'not'), not(contains(parameters.conditions, variables['build.reason']))) }}: - - ${{ parameters.steps }} diff --git a/eng/common/templates/steps/component-governance.yml b/eng/common/templates/steps/component-governance.yml index 0ecec47b0c9..c12a5f8d21d 100644 --- a/eng/common/templates/steps/component-governance.yml +++ b/eng/common/templates/steps/component-governance.yml @@ -1,13 +1,7 @@ -parameters: - disableComponentGovernance: false - componentGovernanceIgnoreDirectories: '' - steps: -- ${{ if eq(parameters.disableComponentGovernance, 'true') }}: - - script: "echo ##vso[task.setvariable variable=skipComponentGovernanceDetection]true" - displayName: Set skipComponentGovernanceDetection variable -- ${{ if ne(parameters.disableComponentGovernance, 'true') }}: - - task: ComponentGovernanceComponentDetection@0 - continueOnError: true - inputs: - ignoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }} \ No newline at end of file +- template: /eng/common/core-templates/steps/component-governance.yml + parameters: + is1ESPipeline: false + + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/eng/common/templates/steps/execute-codeql.yml b/eng/common/templates/steps/execute-codeql.yml deleted file mode 100644 index 3930b163021..00000000000 --- a/eng/common/templates/steps/execute-codeql.yml +++ /dev/null @@ -1,32 +0,0 @@ -parameters: - # Language that should be analyzed. Defaults to csharp - language: csharp - # Build Commands - buildCommands: '' - overrideParameters: '' # Optional: to override values for parameters. - additionalParameters: '' # Optional: parameters that need user specific values eg: '-SourceToolsList @("abc","def") -ArtifactToolsList @("ghi","jkl")' - # Optional: if specified, restore and use this version of Guardian instead of the default. - overrideGuardianVersion: '' - # Optional: if true, publish the '.gdn' folder as a pipeline artifact. This can help with in-depth - # diagnosis of problems with specific tool configurations. - publishGuardianDirectoryToPipeline: false - # The script to run to execute all SDL tools. Use this if you want to use a script to define SDL - # parameters rather than relying on YAML. It may be better to use a local script, because you can - # reproduce results locally without piecing together a command based on the YAML. - executeAllSdlToolsScript: 'eng/common/sdl/execute-all-sdl-tools.ps1' - # There is some sort of bug (has been reported) in Azure DevOps where if this parameter is named - # 'continueOnError', the parameter value is not correctly picked up. - # This can also be remedied by the caller (post-build.yml) if it does not use a nested parameter - # optional: determines whether to continue the build if the step errors; - sdlContinueOnError: false - -steps: -- template: /eng/common/templates/steps/execute-sdl.yml - parameters: - overrideGuardianVersion: ${{ parameters.overrideGuardianVersion }} - executeAllSdlToolsScript: ${{ parameters.executeAllSdlToolsScript }} - overrideParameters: ${{ parameters.overrideParameters }} - additionalParameters: '${{ parameters.additionalParameters }} - -CodeQLAdditionalRunConfigParams @("BuildCommands < ${{ parameters.buildCommands }}", "Language < ${{ parameters.language }}")' - publishGuardianDirectoryToPipeline: ${{ parameters.publishGuardianDirectoryToPipeline }} - sdlContinueOnError: ${{ parameters.sdlContinueOnError }} \ No newline at end of file diff --git a/eng/common/templates/steps/execute-sdl.yml b/eng/common/templates/steps/execute-sdl.yml deleted file mode 100644 index 07426fde05d..00000000000 --- a/eng/common/templates/steps/execute-sdl.yml +++ /dev/null @@ -1,88 +0,0 @@ -parameters: - overrideGuardianVersion: '' - executeAllSdlToolsScript: '' - overrideParameters: '' - additionalParameters: '' - publishGuardianDirectoryToPipeline: false - sdlContinueOnError: false - condition: '' - -steps: -- task: NuGetAuthenticate@1 - inputs: - nuGetServiceConnections: GuardianConnect - -- task: NuGetToolInstaller@1 - displayName: 'Install NuGet.exe' - -- ${{ if ne(parameters.overrideGuardianVersion, '') }}: - - pwsh: | - Set-Location -Path $(Build.SourcesDirectory)\eng\common\sdl - . .\sdl.ps1 - $guardianCliLocation = Install-Gdn -Path $(Build.SourcesDirectory)\.artifacts -Version ${{ parameters.overrideGuardianVersion }} - Write-Host "##vso[task.setvariable variable=GuardianCliLocation]$guardianCliLocation" - displayName: Install Guardian (Overridden) - -- ${{ if eq(parameters.overrideGuardianVersion, '') }}: - - pwsh: | - Set-Location -Path $(Build.SourcesDirectory)\eng\common\sdl - . .\sdl.ps1 - $guardianCliLocation = Install-Gdn -Path $(Build.SourcesDirectory)\.artifacts - Write-Host "##vso[task.setvariable variable=GuardianCliLocation]$guardianCliLocation" - displayName: Install Guardian - -- ${{ if ne(parameters.overrideParameters, '') }}: - - powershell: ${{ parameters.executeAllSdlToolsScript }} ${{ parameters.overrideParameters }} - displayName: Execute SDL (Overridden) - continueOnError: ${{ parameters.sdlContinueOnError }} - condition: ${{ parameters.condition }} - -- ${{ if eq(parameters.overrideParameters, '') }}: - - powershell: ${{ parameters.executeAllSdlToolsScript }} - -GuardianCliLocation $(GuardianCliLocation) - -NugetPackageDirectory $(Build.SourcesDirectory)\.packages - -AzureDevOpsAccessToken $(dn-bot-dotnet-build-rw-code-rw) - ${{ parameters.additionalParameters }} - displayName: Execute SDL - continueOnError: ${{ parameters.sdlContinueOnError }} - condition: ${{ parameters.condition }} - -- ${{ if ne(parameters.publishGuardianDirectoryToPipeline, 'false') }}: - # We want to publish the Guardian results and configuration for easy diagnosis. However, the - # '.gdn' dir is a mix of configuration, results, extracted dependencies, and Guardian default - # tooling files. Some of these files are large and aren't useful during an investigation, so - # exclude them by simply deleting them before publishing. (As of writing, there is no documented - # way to selectively exclude a dir from the pipeline artifact publish task.) - - task: DeleteFiles@1 - displayName: Delete Guardian dependencies to avoid uploading - inputs: - SourceFolder: $(Agent.BuildDirectory)/.gdn - Contents: | - c - i - condition: succeededOrFailed() - - - publish: $(Agent.BuildDirectory)/.gdn - artifact: GuardianConfiguration - displayName: Publish GuardianConfiguration - condition: succeededOrFailed() - - # Publish the SARIF files in a container named CodeAnalysisLogs to enable integration - # with the "SARIF SAST Scans Tab" Azure DevOps extension - - task: CopyFiles@2 - displayName: Copy SARIF files - inputs: - flattenFolders: true - sourceFolder: $(Agent.BuildDirectory)/.gdn/rc/ - contents: '**/*.sarif' - targetFolder: $(Build.SourcesDirectory)/CodeAnalysisLogs - condition: succeededOrFailed() - - # Use PublishBuildArtifacts because the SARIF extension only checks this case - # see microsoft/sarif-azuredevops-extension#4 - - task: PublishBuildArtifacts@1 - displayName: Publish SARIF files to CodeAnalysisLogs container - inputs: - pathToPublish: $(Build.SourcesDirectory)/CodeAnalysisLogs - artifactName: CodeAnalysisLogs - condition: succeededOrFailed() \ No newline at end of file diff --git a/eng/common/templates/steps/generate-sbom.yml b/eng/common/templates/steps/generate-sbom.yml index a06373f38fa..26dc00a2e0f 100644 --- a/eng/common/templates/steps/generate-sbom.yml +++ b/eng/common/templates/steps/generate-sbom.yml @@ -1,48 +1,7 @@ -# BuildDropPath - The root folder of the drop directory for which the manifest file will be generated. -# PackageName - The name of the package this SBOM represents. -# PackageVersion - The version of the package this SBOM represents. -# ManifestDirPath - The path of the directory where the generated manifest files will be placed -# IgnoreDirectories - Directories to ignore for SBOM generation. This will be passed through to the CG component detector. - -parameters: - PackageVersion: 7.0.0 - BuildDropPath: '$(Build.SourcesDirectory)/artifacts' - PackageName: '.NET' - ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom - IgnoreDirectories: '' - sbomContinueOnError: true - steps: -- task: PowerShell@2 - displayName: Prep for SBOM generation in (Non-linux) - condition: or(eq(variables['Agent.Os'], 'Windows_NT'), eq(variables['Agent.Os'], 'Darwin')) - inputs: - filePath: ./eng/common/generate-sbom-prep.ps1 - arguments: ${{parameters.manifestDirPath}} - -# Chmodding is a workaround for https://github.com/dotnet/arcade/issues/8461 -- script: | - chmod +x ./eng/common/generate-sbom-prep.sh - ./eng/common/generate-sbom-prep.sh ${{parameters.manifestDirPath}} - displayName: Prep for SBOM generation in (Linux) - condition: eq(variables['Agent.Os'], 'Linux') - continueOnError: ${{ parameters.sbomContinueOnError }} - -- task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0 - displayName: 'Generate SBOM manifest' - continueOnError: ${{ parameters.sbomContinueOnError }} - inputs: - PackageName: ${{ parameters.packageName }} - BuildDropPath: ${{ parameters.buildDropPath }} - PackageVersion: ${{ parameters.packageVersion }} - ManifestDirPath: ${{ parameters.manifestDirPath }} - ${{ if ne(parameters.IgnoreDirectories, '') }}: - AdditionalComponentDetectorArgs: '--IgnoreDirectories ${{ parameters.IgnoreDirectories }}' - -- task: PublishPipelineArtifact@1 - displayName: Publish SBOM manifest - continueOnError: ${{parameters.sbomContinueOnError}} - inputs: - targetPath: '${{parameters.manifestDirPath}}' - artifactName: $(ARTIFACT_NAME) +- template: /eng/common/core-templates/steps/generate-sbom.yml + parameters: + is1ESPipeline: false + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/eng/common/templates/steps/publish-build-artifacts.yml b/eng/common/templates/steps/publish-build-artifacts.yml new file mode 100644 index 00000000000..6428a98dfef --- /dev/null +++ b/eng/common/templates/steps/publish-build-artifacts.yml @@ -0,0 +1,40 @@ +parameters: +- name: is1ESPipeline + type: boolean + default: false + +- name: displayName + type: string + default: 'Publish to Build Artifact' + +- name: condition + type: string + default: succeeded() + +- name: artifactName + type: string + +- name: pathToPublish + type: string + +- name: continueOnError + type: boolean + default: false + +- name: publishLocation + type: string + default: 'Container' + +steps: +- ${{ if eq(parameters.is1ESPipeline, true) }}: + - 'eng/common/templates cannot be referenced from a 1ES managed template': error +- task: PublishBuildArtifacts@1 + displayName: ${{ parameters.displayName }} + condition: ${{ parameters.condition }} + ${{ if parameters.continueOnError }}: + continueOnError: ${{ parameters.continueOnError }} + inputs: + PublishLocation: ${{ parameters.publishLocation }} + PathtoPublish: ${{ parameters.pathToPublish }} + ${{ if parameters.artifactName }}: + ArtifactName: ${{ parameters.artifactName }} \ No newline at end of file diff --git a/eng/common/templates/steps/publish-logs.yml b/eng/common/templates/steps/publish-logs.yml index 80861297ddc..4ea86bd8823 100644 --- a/eng/common/templates/steps/publish-logs.yml +++ b/eng/common/templates/steps/publish-logs.yml @@ -1,49 +1,7 @@ -parameters: - StageLabel: '' - JobLabel: '' - CustomSensitiveDataList: '' - # A default - in case value from eng/common/templates/post-build/common-variables.yml is not passed - BinlogToolVersion: '1.0.11' - steps: -- task: Powershell@2 - displayName: Prepare Binlogs to Upload - inputs: - targetType: inline - script: | - New-Item -ItemType Directory $(Build.SourcesDirectory)/PostBuildLogs/${{parameters.StageLabel}}/${{parameters.JobLabel}}/ - 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() - -- task: PublishBuildArtifacts@1 - displayName: Publish Logs - inputs: - PathtoPublish: '$(Build.SourcesDirectory)/PostBuildLogs' - PublishLocation: Container - ArtifactName: PostBuildLogs - continueOnError: true - condition: always() +- template: /eng/common/core-templates/steps/publish-logs.yml + parameters: + is1ESPipeline: false + + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/eng/common/templates/steps/publish-pipeline-artifacts.yml b/eng/common/templates/steps/publish-pipeline-artifacts.yml new file mode 100644 index 00000000000..88c56354128 --- /dev/null +++ b/eng/common/templates/steps/publish-pipeline-artifacts.yml @@ -0,0 +1,34 @@ +parameters: +- name: is1ESPipeline + type: boolean + default: false + +- name: args + type: object + default: {} + +steps: +- ${{ if eq(parameters.is1ESPipeline, true) }}: + - 'eng/common/templates cannot be referenced from a 1ES managed template': error +- task: PublishPipelineArtifact@1 + displayName: ${{ coalesce(parameters.args.displayName, 'Publish to Build Artifact') }} + ${{ if parameters.args.condition }}: + condition: ${{ parameters.args.condition }} + ${{ else }}: + condition: succeeded() + ${{ if parameters.args.continueOnError }}: + continueOnError: ${{ parameters.args.continueOnError }} + inputs: + TargetPath: ${{ parameters.args.TargetPath }} + ${{ if parameters.args.ArtifactName }}: + ArtifactName: ${{ parameters.args.ArtifactName }} + ${{ if parameters.args.PublishLocation }}: + PublishLocation: ${{ parameters.args.PublishLocation }} + ${{ if parameters.args.FileSharePath }}: + FileSharePath: ${{ parameters.args.FileSharePath }} + ${{ if parameters.args.Parallel }}: + Parallel: ${{ parameters.args.Parallel }} + ${{ if parameters.args.ParallelCount }}: + ParallelCount: ${{ parameters.args.ParallelCount }} + ${{ if parameters.args.Properties }}: + Properties: ${{ properties.args.Properties }} \ No newline at end of file diff --git a/eng/common/templates/steps/retain-build.yml b/eng/common/templates/steps/retain-build.yml index 83d97a26a01..8e841ace3d2 100644 --- a/eng/common/templates/steps/retain-build.yml +++ b/eng/common/templates/steps/retain-build.yml @@ -1,28 +1,7 @@ -parameters: - # Optional azure devops PAT with build execute permissions for the build's organization, - # only needed if the build that should be retained ran on a different organization than - # the pipeline where this template is executing from - Token: '' - # Optional BuildId to retain, defaults to the current running build - BuildId: '' - # Azure devops Organization URI for the build in the https://dev.azure.com/ format. - # Defaults to the organization the current pipeline is running on - AzdoOrgUri: '$(System.CollectionUri)' - # Azure devops project for the build. Defaults to the project the current pipeline is running on - AzdoProject: '$(System.TeamProject)' - steps: - - task: powershell@2 - inputs: - targetType: 'filePath' - filePath: eng/common/retain-build.ps1 - pwsh: true - arguments: > - -AzdoOrgUri: ${{parameters.AzdoOrgUri}} - -AzdoProject ${{parameters.AzdoProject}} - -Token ${{coalesce(parameters.Token, '$env:SYSTEM_ACCESSTOKEN') }} - -BuildId ${{coalesce(parameters.BuildId, '$env:BUILD_ID')}} - displayName: Enable permanent build retention - env: - SYSTEM_ACCESSTOKEN: $(System.AccessToken) - BUILD_ID: $(Build.BuildId) \ No newline at end of file +- template: /eng/common/core-templates/steps/retain-build.yml + parameters: + is1ESPipeline: false + + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/eng/common/templates/steps/run-on-unix.yml b/eng/common/templates/steps/run-on-unix.yml deleted file mode 100644 index e1733814f65..00000000000 --- a/eng/common/templates/steps/run-on-unix.yml +++ /dev/null @@ -1,7 +0,0 @@ -parameters: - agentOs: '' - steps: [] - -steps: -- ${{ if ne(parameters.agentOs, 'Windows_NT') }}: - - ${{ parameters.steps }} diff --git a/eng/common/templates/steps/run-on-windows.yml b/eng/common/templates/steps/run-on-windows.yml deleted file mode 100644 index 73e7e9c275a..00000000000 --- a/eng/common/templates/steps/run-on-windows.yml +++ /dev/null @@ -1,7 +0,0 @@ -parameters: - agentOs: '' - steps: [] - -steps: -- ${{ if eq(parameters.agentOs, 'Windows_NT') }}: - - ${{ parameters.steps }} diff --git a/eng/common/templates/steps/run-script-ifequalelse.yml b/eng/common/templates/steps/run-script-ifequalelse.yml deleted file mode 100644 index 3d1242f5587..00000000000 --- a/eng/common/templates/steps/run-script-ifequalelse.yml +++ /dev/null @@ -1,33 +0,0 @@ -parameters: - # if parameter1 equals parameter 2, run 'ifScript' command, else run 'elsescript' command - parameter1: '' - parameter2: '' - ifScript: '' - elseScript: '' - - # name of script step - name: Script - - # display name of script step - displayName: If-Equal-Else Script - - # environment - env: {} - - # conditional expression for step execution - condition: '' - -steps: -- ${{ if and(ne(parameters.ifScript, ''), eq(parameters.parameter1, parameters.parameter2)) }}: - - script: ${{ parameters.ifScript }} - name: ${{ parameters.name }} - displayName: ${{ parameters.displayName }} - env: ${{ parameters.env }} - condition: ${{ parameters.condition }} - -- ${{ if and(ne(parameters.elseScript, ''), ne(parameters.parameter1, parameters.parameter2)) }}: - - script: ${{ parameters.elseScript }} - name: ${{ parameters.name }} - displayName: ${{ parameters.displayName }} - env: ${{ parameters.env }} - condition: ${{ parameters.condition }} \ No newline at end of file diff --git a/eng/common/templates/steps/send-to-helix.yml b/eng/common/templates/steps/send-to-helix.yml index 68fa739c4ab..39f99fc2762 100644 --- a/eng/common/templates/steps/send-to-helix.yml +++ b/eng/common/templates/steps/send-to-helix.yml @@ -1,93 +1,7 @@ -# Please remember to update the documentation if you make changes to these parameters! -parameters: - HelixSource: 'pr/default' # required -- sources must start with pr/, official/, prodcon/, or agent/ - HelixType: 'tests/default/' # required -- Helix telemetry which identifies what type of data this is; should include "test" for clarity and must end in '/' - HelixBuild: $(Build.BuildNumber) # required -- the build number Helix will use to identify this -- automatically set to the AzDO build number - HelixTargetQueues: '' # required -- semicolon-delimited list of Helix queues to test on; see https://helix.dot.net/ for a list of queues - HelixAccessToken: '' # required -- access token to make Helix API requests; should be provided by the appropriate variable group - HelixProjectPath: 'eng/common/helixpublish.proj' # optional -- path to the project file to build relative to BUILD_SOURCESDIRECTORY - HelixProjectArguments: '' # optional -- arguments passed to the build command - HelixConfiguration: '' # optional -- additional property attached to a job - HelixPreCommands: '' # optional -- commands to run before Helix work item execution - HelixPostCommands: '' # optional -- commands to run after Helix work item execution - WorkItemDirectory: '' # optional -- a payload directory to zip up and send to Helix; requires WorkItemCommand; incompatible with XUnitProjects - WorkItemCommand: '' # optional -- a command to execute on the payload; requires WorkItemDirectory; incompatible with XUnitProjects - WorkItemTimeout: '' # optional -- a timeout in TimeSpan.Parse-ready value (e.g. 00:02:00) for the work item command; requires WorkItemDirectory; incompatible with XUnitProjects - CorrelationPayloadDirectory: '' # optional -- a directory to zip up and send to Helix as a correlation payload - XUnitProjects: '' # optional -- semicolon-delimited list of XUnitProjects to parse and send to Helix; requires XUnitRuntimeTargetFramework, XUnitPublishTargetFramework, XUnitRunnerVersion, and IncludeDotNetCli=true - XUnitWorkItemTimeout: '' # optional -- the workitem timeout in seconds for all workitems created from the xUnit projects specified by XUnitProjects - XUnitPublishTargetFramework: '' # optional -- framework to use to publish your xUnit projects - XUnitRuntimeTargetFramework: '' # optional -- framework to use for the xUnit console runner - XUnitRunnerVersion: '' # optional -- version of the xUnit nuget package you wish to use on Helix; required for XUnitProjects - IncludeDotNetCli: false # optional -- true will download a version of the .NET CLI onto the Helix machine as a correlation payload; requires DotNetCliPackageType and DotNetCliVersion - DotNetCliPackageType: '' # optional -- either 'sdk', 'runtime' or 'aspnetcore-runtime'; determines whether the sdk or runtime will be sent to Helix; see https://raw.githubusercontent.com/dotnet/core/main/release-notes/releases-index.json - DotNetCliVersion: '' # optional -- version of the CLI to send to Helix; based on this: https://raw.githubusercontent.com/dotnet/core/main/release-notes/releases-index.json - WaitForWorkItemCompletion: true # optional -- true will make the task wait until work items have been completed and fail the build if work items fail. False is "fire and forget." - IsExternal: false # [DEPRECATED] -- doesn't do anything, jobs are external if HelixAccessToken is empty and Creator is set - HelixBaseUri: 'https://helix.dot.net/' # optional -- sets the Helix API base URI (allows targeting https://helix.int-dot.net ) - Creator: '' # optional -- if the build is external, use this to specify who is sending the job - DisplayNamePrefix: 'Run Tests' # optional -- rename the beginning of the displayName of the steps in AzDO - condition: succeeded() # optional -- condition for step to execute; defaults to succeeded() - continueOnError: false # optional -- determines whether to continue the build if the step errors; defaults to false - steps: - - powershell: 'powershell "$env:BUILD_SOURCESDIRECTORY\eng\common\msbuild.ps1 $env:BUILD_SOURCESDIRECTORY/${{ parameters.HelixProjectPath }} /restore /p:TreatWarningsAsErrors=false ${{ parameters.HelixProjectArguments }} /t:Test /bl:$env:BUILD_SOURCESDIRECTORY\artifacts\log\$env:BuildConfig\SendToHelix.binlog"' - displayName: ${{ parameters.DisplayNamePrefix }} (Windows) - env: - BuildConfig: $(_BuildConfig) - HelixSource: ${{ parameters.HelixSource }} - HelixType: ${{ parameters.HelixType }} - HelixBuild: ${{ parameters.HelixBuild }} - HelixConfiguration: ${{ parameters.HelixConfiguration }} - HelixTargetQueues: ${{ parameters.HelixTargetQueues }} - HelixAccessToken: ${{ parameters.HelixAccessToken }} - HelixPreCommands: ${{ parameters.HelixPreCommands }} - HelixPostCommands: ${{ parameters.HelixPostCommands }} - WorkItemDirectory: ${{ parameters.WorkItemDirectory }} - WorkItemCommand: ${{ parameters.WorkItemCommand }} - WorkItemTimeout: ${{ parameters.WorkItemTimeout }} - CorrelationPayloadDirectory: ${{ parameters.CorrelationPayloadDirectory }} - XUnitProjects: ${{ parameters.XUnitProjects }} - XUnitWorkItemTimeout: ${{ parameters.XUnitWorkItemTimeout }} - XUnitPublishTargetFramework: ${{ parameters.XUnitPublishTargetFramework }} - XUnitRuntimeTargetFramework: ${{ parameters.XUnitRuntimeTargetFramework }} - XUnitRunnerVersion: ${{ parameters.XUnitRunnerVersion }} - IncludeDotNetCli: ${{ parameters.IncludeDotNetCli }} - DotNetCliPackageType: ${{ parameters.DotNetCliPackageType }} - DotNetCliVersion: ${{ parameters.DotNetCliVersion }} - WaitForWorkItemCompletion: ${{ parameters.WaitForWorkItemCompletion }} - HelixBaseUri: ${{ parameters.HelixBaseUri }} - Creator: ${{ parameters.Creator }} - SYSTEM_ACCESSTOKEN: $(System.AccessToken) - condition: and(${{ parameters.condition }}, eq(variables['Agent.Os'], 'Windows_NT')) - continueOnError: ${{ parameters.continueOnError }} - - script: $BUILD_SOURCESDIRECTORY/eng/common/msbuild.sh $BUILD_SOURCESDIRECTORY/${{ parameters.HelixProjectPath }} /restore /p:TreatWarningsAsErrors=false ${{ parameters.HelixProjectArguments }} /t:Test /bl:$BUILD_SOURCESDIRECTORY/artifacts/log/$BuildConfig/SendToHelix.binlog - displayName: ${{ parameters.DisplayNamePrefix }} (Unix) - env: - BuildConfig: $(_BuildConfig) - HelixSource: ${{ parameters.HelixSource }} - HelixType: ${{ parameters.HelixType }} - HelixBuild: ${{ parameters.HelixBuild }} - HelixConfiguration: ${{ parameters.HelixConfiguration }} - HelixTargetQueues: ${{ parameters.HelixTargetQueues }} - HelixAccessToken: ${{ parameters.HelixAccessToken }} - HelixPreCommands: ${{ parameters.HelixPreCommands }} - HelixPostCommands: ${{ parameters.HelixPostCommands }} - WorkItemDirectory: ${{ parameters.WorkItemDirectory }} - WorkItemCommand: ${{ parameters.WorkItemCommand }} - WorkItemTimeout: ${{ parameters.WorkItemTimeout }} - CorrelationPayloadDirectory: ${{ parameters.CorrelationPayloadDirectory }} - XUnitProjects: ${{ parameters.XUnitProjects }} - XUnitWorkItemTimeout: ${{ parameters.XUnitWorkItemTimeout }} - XUnitPublishTargetFramework: ${{ parameters.XUnitPublishTargetFramework }} - XUnitRuntimeTargetFramework: ${{ parameters.XUnitRuntimeTargetFramework }} - XUnitRunnerVersion: ${{ parameters.XUnitRunnerVersion }} - IncludeDotNetCli: ${{ parameters.IncludeDotNetCli }} - DotNetCliPackageType: ${{ parameters.DotNetCliPackageType }} - DotNetCliVersion: ${{ parameters.DotNetCliVersion }} - WaitForWorkItemCompletion: ${{ parameters.WaitForWorkItemCompletion }} - HelixBaseUri: ${{ parameters.HelixBaseUri }} - Creator: ${{ parameters.Creator }} - SYSTEM_ACCESSTOKEN: $(System.AccessToken) - condition: and(${{ parameters.condition }}, ne(variables['Agent.Os'], 'Windows_NT')) - continueOnError: ${{ parameters.continueOnError }} +- template: /eng/common/core-templates/steps/send-to-helix.yml + parameters: + is1ESPipeline: false + + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/eng/common/templates/steps/source-build.yml b/eng/common/templates/steps/source-build.yml index 32738aa9380..23c1d6f4e9f 100644 --- a/eng/common/templates/steps/source-build.yml +++ b/eng/common/templates/steps/source-build.yml @@ -1,131 +1,7 @@ -parameters: - # This template adds arcade-powered source-build to CI. - - # This is a 'steps' template, and is intended for advanced scenarios where the existing build - # infra has a careful build methodology that must be followed. For example, a repo - # (dotnet/runtime) might choose to clone the GitHub repo only once and store it as a pipeline - # artifact for all subsequent jobs to use, to reduce dependence on a strong network connection to - # GitHub. Using this steps template leaves room for that infra to be included. - - # Defines the platform on which to run the steps. See 'eng/common/templates/job/source-build.yml' - # for details. The entire object is described in the 'job' template for simplicity, even though - # the usage of the properties on this object is split between the 'job' and 'steps' templates. - platform: {} - steps: -# Build. Keep it self-contained for simple reusability. (No source-build-specific job variables.) -- script: | - set -x - df -h - - # If building on the internal project, the artifact feeds variable may be available (usually only if needed) - # In that case, call the feed setup script to add internal feeds corresponding to public ones. - # In addition, add an msbuild argument to copy the WIP from the repo to the target build location. - # This is because SetupNuGetSources.sh will alter the current NuGet.config file, and we need to preserve those - # changes. - internalRestoreArgs= - if [ '$(dn-bot-dnceng-artifact-feeds-rw)' != '$''(dn-bot-dnceng-artifact-feeds-rw)' ]; then - # Temporarily work around https://github.com/dotnet/arcade/issues/7709 - chmod +x $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh - $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh $(Build.SourcesDirectory)/NuGet.config $(dn-bot-dnceng-artifact-feeds-rw) - internalRestoreArgs='/p:CopyWipIntoInnerSourceBuildRepo=true' - - # The 'Copy WIP' feature of source build uses git stash to apply changes from the original repo. - # This only works if there is a username/email configured, which won't be the case in most CI runs. - git config --get user.email - if [ $? -ne 0 ]; then - git config user.email dn-bot@microsoft.com - git config user.name dn-bot - fi - fi - - # If building on the internal project, the internal storage variable may be available (usually only if needed) - # In that case, add variables to allow the download of internal runtimes if the specified versions are not found - # in the default public locations. - internalRuntimeDownloadArgs= - if [ '$(dotnetbuilds-internal-container-read-token-base64)' != '$''(dotnetbuilds-internal-container-read-token-base64)' ]; then - internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) --runtimesourcefeed https://dotnetbuilds.blob.core.windows.net/internal --runtimesourcefeedkey $(dotnetbuilds-internal-container-read-token-base64)' - fi - - buildConfig=Release - # Check if AzDO substitutes in a build config from a variable, and use it if so. - if [ '$(_BuildConfig)' != '$''(_BuildConfig)' ]; then - buildConfig='$(_BuildConfig)' - fi - - officialBuildArgs= - if [ '${{ and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}' = 'True' ]; then - officialBuildArgs='/p:DotNetPublishUsingPipelines=true /p:OfficialBuildId=$(BUILD.BUILDNUMBER)' - fi - - targetRidArgs= - if [ '${{ parameters.platform.targetRID }}' != '' ]; then - targetRidArgs='/p:TargetRid=${{ parameters.platform.targetRID }}' - fi - - runtimeOsArgs= - if [ '${{ parameters.platform.runtimeOS }}' != '' ]; then - runtimeOsArgs='/p:RuntimeOS=${{ parameters.platform.runtimeOS }}' - fi - - baseOsArgs= - if [ '${{ parameters.platform.baseOS }}' != '' ]; then - baseOsArgs='/p:BaseOS=${{ parameters.platform.baseOS }}' - fi - - publishArgs= - if [ '${{ parameters.platform.skipPublishValidation }}' != 'true' ]; then - publishArgs='--publish' - fi - - assetManifestFileName=SourceBuild_RidSpecific.xml - if [ '${{ parameters.platform.name }}' != '' ]; then - assetManifestFileName=SourceBuild_${{ parameters.platform.name }}.xml - fi - - ${{ coalesce(parameters.platform.buildScript, './build.sh') }} --ci \ - --configuration $buildConfig \ - --restore --build --pack $publishArgs -bl \ - $officialBuildArgs \ - $internalRuntimeDownloadArgs \ - $internalRestoreArgs \ - $targetRidArgs \ - $runtimeOsArgs \ - $baseOsArgs \ - /p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \ - /p:ArcadeBuildFromSource=true \ - /p:DotNetBuildSourceOnly=true \ - /p:DotNetBuildRepo=true \ - /p:AssetManifestFileName=$assetManifestFileName - displayName: Build - -# Upload build logs for diagnosis. -- task: CopyFiles@2 - displayName: Prepare BuildLogs staging directory - inputs: - SourceFolder: '$(Build.SourcesDirectory)' - Contents: | - **/*.log - **/*.binlog - artifacts/sb/prebuilt-report/** - TargetFolder: '$(Build.StagingDirectory)/BuildLogs' - CleanTargetFolder: true - continueOnError: true - condition: succeededOrFailed() - -- task: PublishPipelineArtifact@1 - displayName: Publish BuildLogs - inputs: - targetPath: '$(Build.StagingDirectory)/BuildLogs' - artifactName: BuildLogs_SourceBuild_${{ parameters.platform.name }}_Attempt$(System.JobAttempt) - continueOnError: true - condition: succeededOrFailed() +- template: /eng/common/core-templates/steps/source-build.yml + parameters: + is1ESPipeline: false -# Manually inject component detection so that we can ignore the source build upstream cache, which contains -# a nupkg cache of input packages (a local feed). -# This path must match the upstream cache path in property 'CurrentRepoSourceBuiltNupkgCacheDir' -# in src\Microsoft.DotNet.Arcade.Sdk\tools\SourceBuild\SourceBuildArcade.targets -- task: ComponentGovernanceComponentDetection@0 - displayName: Component Detection (Exclude upstream cache) - inputs: - ignoreDirectories: '$(Build.SourcesDirectory)/artifacts/sb/src/artifacts/obj/source-built-upstream-cache' + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/eng/common/templates/steps/telemetry-end.yml b/eng/common/templates/steps/telemetry-end.yml deleted file mode 100644 index fadc04ca1b9..00000000000 --- a/eng/common/templates/steps/telemetry-end.yml +++ /dev/null @@ -1,102 +0,0 @@ -parameters: - maxRetries: 5 - retryDelay: 10 # in seconds - -steps: -- bash: | - if [ "$AGENT_JOBSTATUS" = "Succeeded" ] || [ "$AGENT_JOBSTATUS" = "PartiallySucceeded" ]; then - errorCount=0 - else - errorCount=1 - fi - warningCount=0 - - curlStatus=1 - retryCount=0 - # retry loop to harden against spotty telemetry connections - # we don't retry successes and 4xx client errors - until [[ $curlStatus -eq 0 || ( $curlStatus -ge 400 && $curlStatus -le 499 ) || $retryCount -ge $MaxRetries ]] - do - if [ $retryCount -gt 0 ]; then - echo "Failed to send telemetry to Helix; waiting $RetryDelay seconds before retrying..." - sleep $RetryDelay - fi - - # create a temporary file for curl output - res=`mktemp` - - curlResult=` - curl --verbose --output $res --write-out "%{http_code}"\ - -H 'Content-Type: application/json' \ - -H "X-Helix-Job-Token: $Helix_JobToken" \ - -H 'Content-Length: 0' \ - -X POST -G "https://helix.dot.net/api/2018-03-14/telemetry/job/build/$Helix_WorkItemId/finish" \ - --data-urlencode "errorCount=$errorCount" \ - --data-urlencode "warningCount=$warningCount"` - curlStatus=$? - - if [ $curlStatus -eq 0 ]; then - if [ $curlResult -gt 299 ] || [ $curlResult -lt 200 ]; then - curlStatus=$curlResult - fi - fi - - let retryCount++ - done - - if [ $curlStatus -ne 0 ]; then - echo "Failed to Send Build Finish information after $retryCount retries" - vstsLogOutput="vso[task.logissue type=error;sourcepath=templates/steps/telemetry-end.yml;code=1;]Failed to Send Build Finish information: $curlStatus" - echo "##$vstsLogOutput" - exit 1 - fi - displayName: Send Unix Build End Telemetry - env: - # defined via VSTS variables in start-job.sh - Helix_JobToken: $(Helix_JobToken) - Helix_WorkItemId: $(Helix_WorkItemId) - MaxRetries: ${{ parameters.maxRetries }} - RetryDelay: ${{ parameters.retryDelay }} - condition: and(always(), ne(variables['Agent.Os'], 'Windows_NT')) -- powershell: | - if (($env:Agent_JobStatus -eq 'Succeeded') -or ($env:Agent_JobStatus -eq 'PartiallySucceeded')) { - $ErrorCount = 0 - } else { - $ErrorCount = 1 - } - $WarningCount = 0 - - # Basic retry loop to harden against server flakiness - $retryCount = 0 - while ($retryCount -lt $env:MaxRetries) { - try { - Invoke-RestMethod -Uri "https://helix.dot.net/api/2018-03-14/telemetry/job/build/$env:Helix_WorkItemId/finish?errorCount=$ErrorCount&warningCount=$WarningCount" -Method Post -ContentType "application/json" -Body "" ` - -Headers @{ 'X-Helix-Job-Token'=$env:Helix_JobToken } - break - } - catch { - $statusCode = $_.Exception.Response.StatusCode.value__ - if ($statusCode -ge 400 -and $statusCode -le 499) { - Write-Host "##vso[task.logissue]error Failed to send telemetry to Helix (status code $statusCode); not retrying (4xx client error)" - Write-Host "##vso[task.logissue]error ", $_.Exception.GetType().FullName, $_.Exception.Message - exit 1 - } - Write-Host "Failed to send telemetry to Helix (status code $statusCode); waiting $env:RetryDelay seconds before retrying..." - $retryCount++ - sleep $env:RetryDelay - continue - } - } - - if ($retryCount -ge $env:MaxRetries) { - Write-Host "##vso[task.logissue]error Failed to send telemetry to Helix after $retryCount retries." - exit 1 - } - displayName: Send Windows Build End Telemetry - env: - # defined via VSTS variables in start-job.ps1 - Helix_JobToken: $(Helix_JobToken) - Helix_WorkItemId: $(Helix_WorkItemId) - MaxRetries: ${{ parameters.maxRetries }} - RetryDelay: ${{ parameters.retryDelay }} - condition: and(always(),eq(variables['Agent.Os'], 'Windows_NT')) diff --git a/eng/common/templates/steps/telemetry-start.yml b/eng/common/templates/steps/telemetry-start.yml deleted file mode 100644 index 32c01ef0b55..00000000000 --- a/eng/common/templates/steps/telemetry-start.yml +++ /dev/null @@ -1,241 +0,0 @@ -parameters: - helixSource: 'undefined_defaulted_in_telemetry.yml' - helixType: 'undefined_defaulted_in_telemetry.yml' - buildConfig: '' - runAsPublic: false - maxRetries: 5 - retryDelay: 10 # in seconds - -steps: -- ${{ if and(eq(parameters.runAsPublic, 'false'), not(eq(variables['System.TeamProject'], 'public'))) }}: - - task: AzureKeyVault@1 - inputs: - azureSubscription: 'HelixProd_KeyVault' - KeyVaultName: HelixProdKV - SecretsFilter: 'HelixApiAccessToken' - condition: always() -- bash: | - # create a temporary file - jobInfo=`mktemp` - - # write job info content to temporary file - cat > $jobInfo < Date: Fri, 26 Apr 2024 12:36:08 -0700 Subject: [PATCH 171/568] Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20240425.1 (#6528) Microsoft.CodeAnalysis.NetAnalyzers From Version 9.0.0-preview.24216.2 -> To Version 9.0.0-preview.24225.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b135c1a58de..13d16c01b8c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -18,9 +18,9 @@ - + https://github.com/dotnet/roslyn-analyzers - b07c100bfc66013a8444172d00cfa04c9ceb5a97 + 8dccccec1ce3bd2fb532ec77d7e092ab9d684db7 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index cf76a2bc3ab..c9e67080a95 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -62,7 +62,7 @@ 9.0.100-preview.4.24223.1 - 9.0.0-preview.24216.2 + 9.0.0-preview.24225.1 9.0.0-preview.4.24218.7 9.0.0-preview.4.24218.7 From 56e7a8b45ba2ca9b59f0618ff31f6bd7644454f2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 28 Apr 2024 14:03:01 +0000 Subject: [PATCH 172/568] Update dependencies from https://github.com/dotnet/diagnostics build 20240426.1 (#6535) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 13d16c01b8c..9a0839c7c47 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore 7d5309210d8f7bae8fa074da495e9d009d67f1b4 - + https://github.com/dotnet/diagnostics - 287467a77bcff8b5b2c2bcc04e59b5ee56079a65 + b6418173e784ec41a65c710c559120f8996fca7d - + https://github.com/dotnet/diagnostics - 287467a77bcff8b5b2c2bcc04e59b5ee56079a65 + b6418173e784ec41a65c710c559120f8996fca7d https://github.com/dotnet/command-line-api @@ -46,9 +46,9 @@ https://github.com/dotnet/arcade 6ca3ae2ae79ef707c76ea1abf82b0787824b6da0 - + https://github.com/dotnet/diagnostics - 287467a77bcff8b5b2c2bcc04e59b5ee56079a65 + b6418173e784ec41a65c710c559120f8996fca7d https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index c9e67080a95..329079d3c85 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24209.3 - 8.0.0-preview.24225.1 - 8.0.0-preview.24225.1 + 8.0.0-preview.24226.1 + 8.0.0-preview.24226.1 9.0.100-preview.4.24223.1 @@ -67,7 +67,7 @@ 9.0.0-preview.4.24218.7 9.0.0-preview.4.24218.7 - 8.0.0-preview.24225.1 + 8.0.0-preview.24226.1 $(MicrosoftNETCoreApp31Version) From 5631c175afdc472892caa945a66ebee11ba474f8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 29 Apr 2024 20:30:09 +0000 Subject: [PATCH 173/568] Update dependencies from https://github.com/dotnet/arcade build 20240426.3 (#6533) [feature/9.x] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- eng/common/template-guidance.md | 4 ++-- eng/common/templates/job/job.yml | 3 +++ global.json | 4 ++-- 5 files changed, 20 insertions(+), 17 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9a0839c7c47..156680380b0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,29 +22,29 @@ https://github.com/dotnet/roslyn-analyzers 8dccccec1ce3bd2fb532ec77d7e092ab9d684db7 - + https://github.com/dotnet/arcade - 6ca3ae2ae79ef707c76ea1abf82b0787824b6da0 + 97e2f41e909dcabb1103fe98ba4540a246662187 - + https://github.com/dotnet/arcade - 6ca3ae2ae79ef707c76ea1abf82b0787824b6da0 + 97e2f41e909dcabb1103fe98ba4540a246662187 - + https://github.com/dotnet/arcade - 6ca3ae2ae79ef707c76ea1abf82b0787824b6da0 + 97e2f41e909dcabb1103fe98ba4540a246662187 - + https://github.com/dotnet/arcade - 6ca3ae2ae79ef707c76ea1abf82b0787824b6da0 + 97e2f41e909dcabb1103fe98ba4540a246662187 https://github.com/dotnet/installer e99dabfa3ffa2dd963ab626af498f32b570a4917 - + https://github.com/dotnet/arcade - 6ca3ae2ae79ef707c76ea1abf82b0787824b6da0 + 97e2f41e909dcabb1103fe98ba4540a246662187 https://github.com/dotnet/diagnostics diff --git a/eng/Versions.props b/eng/Versions.props index 329079d3c85..0d347e9f767 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,9 +48,9 @@ --> - 9.0.0-beta.24224.2 - 9.0.0-beta.24224.2 - 9.0.0-beta.24224.2 + 9.0.0-beta.24226.3 + 9.0.0-beta.24226.3 + 9.0.0-beta.24226.3 9.0.0-preview.4.24218.1 9.0.0-preview.4.24218.1 diff --git a/eng/common/template-guidance.md b/eng/common/template-guidance.md index 595917fac1a..c114bc28dcb 100644 --- a/eng/common/template-guidance.md +++ b/eng/common/template-guidance.md @@ -130,8 +130,8 @@ In the table above, a file is designated as "shim", "logic", or "redirect". - redirect- represents a file in `core-templates` which redirects to the "logic" file in either `templates` or `templates-official`. -Logic for Arcade's templates live **primarily** in the `core-templates` folder. The exceptions to the location of the logic files are around artifact publishing, which is handled differently between 1es pipeline templates and standard templates. `templates` and `templates-official` provide shim entry points which redirect to `core-templates` while also defining the `is1ESPipeline` parameter. If a shim is referenced in `templates`, then `is1ESPipeline` is set to `false`. If a shim is referenced in `templates-official`, then `is1ESPipeline` is set to `true`. +Logic for Arcade's templates live **primarily** in the `core-templates` folder. The exceptions to the location of the logic files are around artifact publishing, which is handled differently between 1es pipeline templates and standard templates. `templates` and `templates-official` provide shim entry points which redirect to `core-templates` while also defining the `is1ESPipeline` parameter. If a shim is referenced in `templates`, then `is1ESPipeline` is set to `false`. If a shim is referenced in `templates-official`, then `is1ESPipeline` is set to `true`. Within `templates` and `templates-official`, the templates at the "stages", and "jobs" / "job" level have been replaced with shims. Templates at the "steps" and "variables" level are typically too granular to be replaced with shims and instead persist logic which is directly applicable to either scenario. -Within `core-templates`, there are a handful of places where logic is dependent on which shim entry point was used. In those places, we redirect back to the respective logic file in `templates` or `templates-official`. +Within `core-templates`, there are a handful of places where logic is dependent on which shim entry point was used. In those places, we redirect back to the respective logic file in `templates` or `templates-official`. diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index fca89ff2e06..1cf9a6d4812 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -1,3 +1,6 @@ +parameters: + enablePublishBuildArtifacts: false + jobs: - template: /eng/common/core-templates/job/job.yml parameters: diff --git a/global.json b/global.json index 79875889403..b49f0c3e682 100644 --- a/global.json +++ b/global.json @@ -31,7 +31,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24224.2", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24224.2" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24226.3", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24226.3" } } From 14bf32caac05b8b7f973916c30863114f2d1ef12 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 30 Apr 2024 14:06:58 +0000 Subject: [PATCH 174/568] Update dependencies from https://github.com/dotnet/diagnostics build 20240429.1 (#6556) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 156680380b0..d4d75ec64cd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore 7d5309210d8f7bae8fa074da495e9d009d67f1b4 - + https://github.com/dotnet/diagnostics - b6418173e784ec41a65c710c559120f8996fca7d + 7ea3199ff6532fadadae93a44e929387710a3334 - + https://github.com/dotnet/diagnostics - b6418173e784ec41a65c710c559120f8996fca7d + 7ea3199ff6532fadadae93a44e929387710a3334 https://github.com/dotnet/command-line-api @@ -46,9 +46,9 @@ https://github.com/dotnet/arcade 97e2f41e909dcabb1103fe98ba4540a246662187 - + https://github.com/dotnet/diagnostics - b6418173e784ec41a65c710c559120f8996fca7d + 7ea3199ff6532fadadae93a44e929387710a3334 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 0d347e9f767..31065313438 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24209.3 - 8.0.0-preview.24226.1 - 8.0.0-preview.24226.1 + 8.0.0-preview.24229.1 + 8.0.0-preview.24229.1 9.0.100-preview.4.24223.1 @@ -67,7 +67,7 @@ 9.0.0-preview.4.24218.7 9.0.0-preview.4.24218.7 - 8.0.0-preview.24226.1 + 8.0.0-preview.24229.1 $(MicrosoftNETCoreApp31Version) From ea2cc2371b433eba2effd8ad720bfb38436fc5d8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 30 Apr 2024 16:21:09 +0000 Subject: [PATCH 175/568] Update dependencies from https://github.com/dotnet/arcade build 20240429.1 (#6557) [feature/9.x] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 ++++++++-------- eng/Versions.props | 6 ++--- .../steps/publish-pipeline-artifacts.yml | 24 +++++++++---------- global.json | 4 ++-- 4 files changed, 27 insertions(+), 27 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d4d75ec64cd..78aeaf16b3f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,29 +22,29 @@ https://github.com/dotnet/roslyn-analyzers 8dccccec1ce3bd2fb532ec77d7e092ab9d684db7 - + https://github.com/dotnet/arcade - 97e2f41e909dcabb1103fe98ba4540a246662187 + be933308b9024d798a9a22c0b8f3c8e3616ffbd8 - + https://github.com/dotnet/arcade - 97e2f41e909dcabb1103fe98ba4540a246662187 + be933308b9024d798a9a22c0b8f3c8e3616ffbd8 - + https://github.com/dotnet/arcade - 97e2f41e909dcabb1103fe98ba4540a246662187 + be933308b9024d798a9a22c0b8f3c8e3616ffbd8 - + https://github.com/dotnet/arcade - 97e2f41e909dcabb1103fe98ba4540a246662187 + be933308b9024d798a9a22c0b8f3c8e3616ffbd8 https://github.com/dotnet/installer e99dabfa3ffa2dd963ab626af498f32b570a4917 - + https://github.com/dotnet/arcade - 97e2f41e909dcabb1103fe98ba4540a246662187 + be933308b9024d798a9a22c0b8f3c8e3616ffbd8 https://github.com/dotnet/diagnostics diff --git a/eng/Versions.props b/eng/Versions.props index 31065313438..74afde18bd6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,9 +48,9 @@ --> - 9.0.0-beta.24226.3 - 9.0.0-beta.24226.3 - 9.0.0-beta.24226.3 + 9.0.0-beta.24229.1 + 9.0.0-beta.24229.1 + 9.0.0-beta.24229.1 9.0.0-preview.4.24218.1 9.0.0-preview.4.24218.1 diff --git a/eng/common/templates/steps/publish-pipeline-artifacts.yml b/eng/common/templates/steps/publish-pipeline-artifacts.yml index 88c56354128..815c86038e3 100644 --- a/eng/common/templates/steps/publish-pipeline-artifacts.yml +++ b/eng/common/templates/steps/publish-pipeline-artifacts.yml @@ -19,16 +19,16 @@ steps: ${{ if parameters.args.continueOnError }}: continueOnError: ${{ parameters.args.continueOnError }} inputs: - TargetPath: ${{ parameters.args.TargetPath }} - ${{ if parameters.args.ArtifactName }}: - ArtifactName: ${{ parameters.args.ArtifactName }} - ${{ if parameters.args.PublishLocation }}: - PublishLocation: ${{ parameters.args.PublishLocation }} - ${{ if parameters.args.FileSharePath }}: - FileSharePath: ${{ parameters.args.FileSharePath }} + targetPath: ${{ parameters.args.targetPath }} + ${{ if parameters.args.artifactName }}: + artifactName: ${{ parameters.args.artifactName }} + ${{ if parameters.args.publishLocation }}: + publishLocation: ${{ parameters.args.publishLocation }} + ${{ if parameters.args.fileSharePath }}: + fileSharePath: ${{ parameters.args.fileSharePath }} ${{ if parameters.args.Parallel }}: - Parallel: ${{ parameters.args.Parallel }} - ${{ if parameters.args.ParallelCount }}: - ParallelCount: ${{ parameters.args.ParallelCount }} - ${{ if parameters.args.Properties }}: - Properties: ${{ properties.args.Properties }} \ No newline at end of file + parallel: ${{ parameters.args.Parallel }} + ${{ if parameters.args.parallelCount }}: + parallelCount: ${{ parameters.args.parallelCount }} + ${{ if parameters.args.properties }}: + properties: ${{ properties.args.properties }} \ No newline at end of file diff --git a/global.json b/global.json index b49f0c3e682..a12296b9db2 100644 --- a/global.json +++ b/global.json @@ -31,7 +31,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24226.3", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24226.3" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24229.1", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24229.1" } } From 0a4bda486981613da0ef2f78564b5a56e950c9ff Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 30 Apr 2024 15:24:22 -0700 Subject: [PATCH 176/568] [feature/9.x] Update dependencies from dotnet/installer (#6515) * Update dependencies from https://github.com/dotnet/installer build 20240424.3 Microsoft.Dotnet.Sdk.Internal From Version 9.0.100-preview.4.24223.1 -> To Version 9.0.100-preview.4.24224.3 Dependency coherency updates Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0 From Version 9.0.0-preview.4.24218.1 -> To Version 9.0.0-preview.4.24223.1 (parent: Microsoft.Dotnet.Sdk.Internal * Update dependencies from https://github.com/dotnet/installer build 20240425.2 Microsoft.Dotnet.Sdk.Internal From Version 9.0.100-preview.4.24223.1 -> To Version 9.0.100-preview.5.24225.2 Dependency coherency updates Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0 From Version 9.0.0-preview.4.24218.1 -> To Version 9.0.0-preview.4.24223.1 (parent: Microsoft.Dotnet.Sdk.Internal * Update dependencies from https://github.com/dotnet/installer build 20240425.4 Microsoft.Dotnet.Sdk.Internal From Version 9.0.100-preview.4.24223.1 -> To Version 9.0.100-preview.5.24225.4 Dependency coherency updates Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0 From Version 9.0.0-preview.4.24218.1 -> To Version 9.0.0-preview.4.24223.1 (parent: Microsoft.Dotnet.Sdk.Internal * Allow win-arm64 test step to continue on error * Update dependencies from https://github.com/dotnet/installer build 20240425.4 Microsoft.Dotnet.Sdk.Internal From Version 9.0.100-preview.4.24223.1 -> To Version 9.0.100-preview.5.24225.4 Dependency coherency updates Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0 From Version 9.0.0-preview.4.24218.1 -> To Version 9.0.0-preview.4.24223.1 (parent: Microsoft.Dotnet.Sdk.Internal * Update dependencies from https://github.com/dotnet/installer build 20240425.4 Microsoft.Dotnet.Sdk.Internal From Version 9.0.100-preview.4.24223.1 -> To Version 9.0.100-preview.5.24225.4 Dependency coherency updates Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0 From Version 9.0.0-preview.4.24218.1 -> To Version 9.0.0-preview.4.24223.1 (parent: Microsoft.Dotnet.Sdk.Internal * Update dependencies from https://github.com/dotnet/installer build 20240429.2 Microsoft.Dotnet.Sdk.Internal From Version 9.0.100-preview.4.24223.1 -> To Version 9.0.100-preview.5.24229.2 Dependency coherency updates Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0 From Version 9.0.0-preview.4.24218.1 -> To Version 9.0.0-preview.4.24223.1 (parent: Microsoft.Dotnet.Sdk.Internal * Update dependencies from https://github.com/dotnet/installer build 20240429.2 Microsoft.Dotnet.Sdk.Internal From Version 9.0.100-preview.4.24223.1 -> To Version 9.0.100-preview.5.24229.2 Dependency coherency updates Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0 From Version 9.0.0-preview.4.24218.1 -> To Version 9.0.0-preview.4.24223.1 (parent: Microsoft.Dotnet.Sdk.Internal --------- Co-authored-by: dotnet-maestro[bot] Co-authored-by: Justin Anderson --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- eng/pipelines/jobs/build.yml | 2 ++ eng/pipelines/jobs/test-binaries.yml | 6 ++++++ 4 files changed, 23 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 78aeaf16b3f..8a3293f739d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/aspnetcore - 7d5309210d8f7bae8fa074da495e9d009d67f1b4 + f18510c2fbdfc11b8144ced4857b3d878fa70965 https://github.com/dotnet/diagnostics @@ -38,9 +38,9 @@ https://github.com/dotnet/arcade be933308b9024d798a9a22c0b8f3c8e3616ffbd8 - + https://github.com/dotnet/installer - e99dabfa3ffa2dd963ab626af498f32b570a4917 + d301a122c4f9d017cdc3a506f831e2edfc124ea7 https://github.com/dotnet/arcade @@ -50,17 +50,17 @@ https://github.com/dotnet/diagnostics 7ea3199ff6532fadadae93a44e929387710a3334 - + https://github.com/dotnet/runtime - b0118bebe385cb68f272a32ca6a5c5bb53c9b14f + d92ac1f892a7f9c00561db6541671f25f3972eed - + https://github.com/dotnet/aspnetcore - 7d5309210d8f7bae8fa074da495e9d009d67f1b4 + f18510c2fbdfc11b8144ced4857b3d878fa70965 - + https://github.com/dotnet/runtime - b0118bebe385cb68f272a32ca6a5c5bb53c9b14f + d92ac1f892a7f9c00561db6541671f25f3972eed diff --git a/eng/Versions.props b/eng/Versions.props index 74afde18bd6..1541abf24c1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,20 +52,20 @@ 9.0.0-beta.24229.1 9.0.0-beta.24229.1 - 9.0.0-preview.4.24218.1 - 9.0.0-preview.4.24218.1 + 9.0.0-preview.4.24223.1 + 9.0.0-preview.4.24223.1 2.0.0-beta4.24209.3 8.0.0-preview.24229.1 8.0.0-preview.24229.1 - 9.0.100-preview.4.24223.1 + 9.0.100-preview.5.24229.2 9.0.0-preview.24225.1 - 9.0.0-preview.4.24218.7 - 9.0.0-preview.4.24218.7 + 9.0.0-preview.4.24223.11 + 9.0.0-preview.4.24223.11 8.0.0-preview.24229.1 diff --git a/eng/pipelines/jobs/build.yml b/eng/pipelines/jobs/build.yml index 6c2c33613c4..0d8e6d1e8ad 100644 --- a/eng/pipelines/jobs/build.yml +++ b/eng/pipelines/jobs/build.yml @@ -30,6 +30,7 @@ parameters: disableSbom: false buildArgs: '' buildEnv: {} + buildContinueOnError: false # Adjust for 1ES pipeline template is1ESPipeline: true commonTemplatesFolderName: 'templates-official' @@ -154,6 +155,7 @@ jobs: # Set ROOTFS_DIR for Linux cross builds ${{ if and(eq(parameters.enableCrossBuild, 'true'), in(parameters.osGroup, 'Linux', 'Linux_Musl')) }}: ROOTFS_DIR: '/crossrootfs/${{ parameters.architecture }}' + continueOnError: ${{ parameters.buildContinueOnError }} - ${{ each step in parameters.postBuildSteps }}: - ${{ step }} diff --git a/eng/pipelines/jobs/test-binaries.yml b/eng/pipelines/jobs/test-binaries.yml index d4914cfa4a7..84710dc25ac 100644 --- a/eng/pipelines/jobs/test-binaries.yml +++ b/eng/pipelines/jobs/test-binaries.yml @@ -184,6 +184,12 @@ jobs: HelixAccessToken: $(HelixApiAccessToken) DotNetBuildsInternalContainerReadToken: $(dotnetbuilds-internal-container-read-token) + # .NET 9 Windows ARM64 dotnet test currently stalls and times out without error. Allow + # the test step to continue on error for this configuration. + # Issue: https://github.com/dotnet/dotnet-monitor/issues/6531 + ${{ if eq(parameters.targetRid, 'win-arm64') }}: + buildContinueOnError: true + postBuildSteps: - ${{ if ne(parameters.useHelix, 'true')}}: # Publish test results to Azure Pipelines From 6f0e664c0fbc27650a48f56a7c124febf788a1fa Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 2 May 2024 14:02:14 +0000 Subject: [PATCH 177/568] Update dependencies from https://github.com/dotnet/diagnostics build 20240501.1 (#6568) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8a3293f739d..31918b2f570 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore f18510c2fbdfc11b8144ced4857b3d878fa70965 - + https://github.com/dotnet/diagnostics - 7ea3199ff6532fadadae93a44e929387710a3334 + cbebfd3838eb6adc6f39e47b0786f8f245f34efe - + https://github.com/dotnet/diagnostics - 7ea3199ff6532fadadae93a44e929387710a3334 + cbebfd3838eb6adc6f39e47b0786f8f245f34efe https://github.com/dotnet/command-line-api @@ -46,9 +46,9 @@ https://github.com/dotnet/arcade be933308b9024d798a9a22c0b8f3c8e3616ffbd8 - + https://github.com/dotnet/diagnostics - 7ea3199ff6532fadadae93a44e929387710a3334 + cbebfd3838eb6adc6f39e47b0786f8f245f34efe https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 1541abf24c1..a32235363ea 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24209.3 - 8.0.0-preview.24229.1 - 8.0.0-preview.24229.1 + 8.0.0-preview.24251.1 + 8.0.0-preview.24251.1 9.0.100-preview.5.24229.2 @@ -67,7 +67,7 @@ 9.0.0-preview.4.24223.11 9.0.0-preview.4.24223.11 - 8.0.0-preview.24229.1 + 8.0.0-preview.24251.1 $(MicrosoftNETCoreApp31Version) From 3d59db431b8a59d7810836b5dc3a88a7230bcc3d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 4 May 2024 00:15:45 +0000 Subject: [PATCH 178/568] Update dependencies from https://github.com/dotnet/arcade build 20240503.1 (#6574) [feature/9.x] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 +++++++++---------- eng/Versions.props | 6 +++--- eng/common/native/init-compiler.sh | 2 +- .../steps/publish-pipeline-artifacts.yml | 2 +- .../steps/publish-pipeline-artifacts.yml | 2 +- global.json | 4 ++-- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 31918b2f570..f8c5d1f3c36 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,29 +22,29 @@ https://github.com/dotnet/roslyn-analyzers 8dccccec1ce3bd2fb532ec77d7e092ab9d684db7 - + https://github.com/dotnet/arcade - be933308b9024d798a9a22c0b8f3c8e3616ffbd8 + 020255bcf7d0b8beed7de05338d97396982ae527 - + https://github.com/dotnet/arcade - be933308b9024d798a9a22c0b8f3c8e3616ffbd8 + 020255bcf7d0b8beed7de05338d97396982ae527 - + https://github.com/dotnet/arcade - be933308b9024d798a9a22c0b8f3c8e3616ffbd8 + 020255bcf7d0b8beed7de05338d97396982ae527 - + https://github.com/dotnet/arcade - be933308b9024d798a9a22c0b8f3c8e3616ffbd8 + 020255bcf7d0b8beed7de05338d97396982ae527 https://github.com/dotnet/installer d301a122c4f9d017cdc3a506f831e2edfc124ea7 - + https://github.com/dotnet/arcade - be933308b9024d798a9a22c0b8f3c8e3616ffbd8 + 020255bcf7d0b8beed7de05338d97396982ae527 https://github.com/dotnet/diagnostics diff --git a/eng/Versions.props b/eng/Versions.props index a32235363ea..020addd299d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,9 +48,9 @@ --> - 9.0.0-beta.24229.1 - 9.0.0-beta.24229.1 - 9.0.0-beta.24229.1 + 9.0.0-beta.24253.1 + 9.0.0-beta.24253.1 + 9.0.0-beta.24253.1 9.0.0-preview.4.24223.1 9.0.0-preview.4.24223.1 diff --git a/eng/common/native/init-compiler.sh b/eng/common/native/init-compiler.sh index afdeb7a4d54..ccd3a17268e 100644 --- a/eng/common/native/init-compiler.sh +++ b/eng/common/native/init-compiler.sh @@ -64,7 +64,7 @@ if [ -z "$CLR_CC" ]; then if [ -z "$majorVersion" ]; then # note: gcc (all versions) and clang versions higher than 6 do not have minor version in file name, if it is zero. if [ "$compiler" = "clang" ]; then versions="18 17 16 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5" - elif [ "$compiler" = "gcc" ]; then versions="13 12 11 10 9 8 7 6 5 4.9"; fi + elif [ "$compiler" = "gcc" ]; then versions="14 13 12 11 10 9 8 7 6 5 4.9"; fi for version in $versions; do _major="${version%%.*}" diff --git a/eng/common/templates-official/steps/publish-pipeline-artifacts.yml b/eng/common/templates-official/steps/publish-pipeline-artifacts.yml index 15d74a9d916..d71eb0c7439 100644 --- a/eng/common/templates-official/steps/publish-pipeline-artifacts.yml +++ b/eng/common/templates-official/steps/publish-pipeline-artifacts.yml @@ -23,4 +23,4 @@ steps: ${{ if parameters.args.artifactName }}: artifactName: ${{ parameters.args.artifactName }} ${{ if parameters.args.properties }}: - properties: ${{ properties.args.properties }} \ No newline at end of file + properties: ${{ parameters.args.properties }} \ No newline at end of file diff --git a/eng/common/templates/steps/publish-pipeline-artifacts.yml b/eng/common/templates/steps/publish-pipeline-artifacts.yml index 815c86038e3..5dd698b212f 100644 --- a/eng/common/templates/steps/publish-pipeline-artifacts.yml +++ b/eng/common/templates/steps/publish-pipeline-artifacts.yml @@ -31,4 +31,4 @@ steps: ${{ if parameters.args.parallelCount }}: parallelCount: ${{ parameters.args.parallelCount }} ${{ if parameters.args.properties }}: - properties: ${{ properties.args.properties }} \ No newline at end of file + properties: ${{ parameters.args.properties }} \ No newline at end of file diff --git a/global.json b/global.json index a12296b9db2..dc50703cc05 100644 --- a/global.json +++ b/global.json @@ -31,7 +31,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24229.1", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24229.1" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24253.1", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24253.1" } } From da67887787d0fb22af92c92ef50171d321df2a45 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 5 May 2024 10:37:25 -0700 Subject: [PATCH 179/568] [feature/9.x] Update dependencies from dotnet/installer (#6575) --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f8c5d1f3c36..92357666f8f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/aspnetcore - f18510c2fbdfc11b8144ced4857b3d878fa70965 + 83b527e6a42d6729df191de8e4aa3fdfdb0d5709 https://github.com/dotnet/diagnostics @@ -38,9 +38,9 @@ https://github.com/dotnet/arcade 020255bcf7d0b8beed7de05338d97396982ae527 - + https://github.com/dotnet/installer - d301a122c4f9d017cdc3a506f831e2edfc124ea7 + fa261b952d702c6bd604728fcbdb58ac071a22b1 https://github.com/dotnet/arcade @@ -50,17 +50,17 @@ https://github.com/dotnet/diagnostics cbebfd3838eb6adc6f39e47b0786f8f245f34efe - + https://github.com/dotnet/runtime - d92ac1f892a7f9c00561db6541671f25f3972eed + 4326eb7ed4d03f30ce4a4de1eb028ee76fdaaa3c - + https://github.com/dotnet/aspnetcore - f18510c2fbdfc11b8144ced4857b3d878fa70965 + 83b527e6a42d6729df191de8e4aa3fdfdb0d5709 - + https://github.com/dotnet/runtime - d92ac1f892a7f9c00561db6541671f25f3972eed + 4326eb7ed4d03f30ce4a4de1eb028ee76fdaaa3c diff --git a/eng/Versions.props b/eng/Versions.props index 020addd299d..7d192a61d41 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,20 +52,20 @@ 9.0.0-beta.24253.1 9.0.0-beta.24253.1 - 9.0.0-preview.4.24223.1 - 9.0.0-preview.4.24223.1 + 9.0.0-preview.5.24251.4 + 9.0.0-preview.5.24251.4 2.0.0-beta4.24209.3 8.0.0-preview.24251.1 8.0.0-preview.24251.1 - 9.0.100-preview.5.24229.2 + 9.0.100-preview.5.24253.16 9.0.0-preview.24225.1 - 9.0.0-preview.4.24223.11 - 9.0.0-preview.4.24223.11 + 9.0.0-preview.4.24251.3 + 9.0.0-preview.4.24251.3 8.0.0-preview.24251.1 From 1fdb1de5ab9062fd88d151af20ae8aa74168971c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 6 May 2024 14:06:32 +0000 Subject: [PATCH 180/568] Update dependencies from https://github.com/dotnet/diagnostics build 20240503.1 (#6581) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 92357666f8f..531daadd2a1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore 83b527e6a42d6729df191de8e4aa3fdfdb0d5709 - + https://github.com/dotnet/diagnostics - cbebfd3838eb6adc6f39e47b0786f8f245f34efe + 78b52e20255693ecce58b51807dd4a582e14d4ae - + https://github.com/dotnet/diagnostics - cbebfd3838eb6adc6f39e47b0786f8f245f34efe + 78b52e20255693ecce58b51807dd4a582e14d4ae https://github.com/dotnet/command-line-api @@ -46,9 +46,9 @@ https://github.com/dotnet/arcade 020255bcf7d0b8beed7de05338d97396982ae527 - + https://github.com/dotnet/diagnostics - cbebfd3838eb6adc6f39e47b0786f8f245f34efe + 78b52e20255693ecce58b51807dd4a582e14d4ae https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 7d192a61d41..d6ef39d9570 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24209.3 - 8.0.0-preview.24251.1 - 8.0.0-preview.24251.1 + 8.0.0-preview.24253.1 + 8.0.0-preview.24253.1 9.0.100-preview.5.24253.16 @@ -67,7 +67,7 @@ 9.0.0-preview.4.24251.3 9.0.0-preview.4.24251.3 - 8.0.0-preview.24251.1 + 8.0.0-preview.24253.1 $(MicrosoftNETCoreApp31Version) From 662b5055a2af5298b098f163c2b8f85638dd4406 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 7 May 2024 14:25:49 +0000 Subject: [PATCH 181/568] Update dependencies from https://github.com/dotnet/diagnostics build 20240506.1 (#6586) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 531daadd2a1..f3006a8029d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore 83b527e6a42d6729df191de8e4aa3fdfdb0d5709 - + https://github.com/dotnet/diagnostics - 78b52e20255693ecce58b51807dd4a582e14d4ae + e5f6b52bb66e75d1b56945b2d1a5773289e544e4 - + https://github.com/dotnet/diagnostics - 78b52e20255693ecce58b51807dd4a582e14d4ae + e5f6b52bb66e75d1b56945b2d1a5773289e544e4 https://github.com/dotnet/command-line-api @@ -46,9 +46,9 @@ https://github.com/dotnet/arcade 020255bcf7d0b8beed7de05338d97396982ae527 - + https://github.com/dotnet/diagnostics - 78b52e20255693ecce58b51807dd4a582e14d4ae + e5f6b52bb66e75d1b56945b2d1a5773289e544e4 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index d6ef39d9570..0d9639ad1f4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24209.3 - 8.0.0-preview.24253.1 - 8.0.0-preview.24253.1 + 8.0.0-preview.24256.1 + 8.0.0-preview.24256.1 9.0.100-preview.5.24253.16 @@ -67,7 +67,7 @@ 9.0.0-preview.4.24251.3 9.0.0-preview.4.24251.3 - 8.0.0-preview.24253.1 + 8.0.0-preview.24256.1 $(MicrosoftNETCoreApp31Version) From b4d4e0ddb10007c9a3f0bf14d141a00392340f46 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 7 May 2024 14:29:32 +0000 Subject: [PATCH 182/568] Update dependencies from https://github.com/dotnet/arcade build 20240507.1 (#6587) [feature/9.x] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 +-- eng/Versions.props | 6 +- .../job/source-index-stage1.yml | 40 ++++-- .../core-templates/post-build/post-build.yml | 40 ++++-- eng/common/cross/build-rootfs.sh | 122 +++++++++++++++--- eng/common/native/init-distro-rid.sh | 18 +-- global.json | 4 +- 7 files changed, 175 insertions(+), 75 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f3006a8029d..b4ffcdcb364 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,29 +22,29 @@ https://github.com/dotnet/roslyn-analyzers 8dccccec1ce3bd2fb532ec77d7e092ab9d684db7 - + https://github.com/dotnet/arcade - 020255bcf7d0b8beed7de05338d97396982ae527 + f663d5690bfe8e442a8c3e9fff9b6735014fbec4 - + https://github.com/dotnet/arcade - 020255bcf7d0b8beed7de05338d97396982ae527 + f663d5690bfe8e442a8c3e9fff9b6735014fbec4 - + https://github.com/dotnet/arcade - 020255bcf7d0b8beed7de05338d97396982ae527 + f663d5690bfe8e442a8c3e9fff9b6735014fbec4 - + https://github.com/dotnet/arcade - 020255bcf7d0b8beed7de05338d97396982ae527 + f663d5690bfe8e442a8c3e9fff9b6735014fbec4 https://github.com/dotnet/installer fa261b952d702c6bd604728fcbdb58ac071a22b1 - + https://github.com/dotnet/arcade - 020255bcf7d0b8beed7de05338d97396982ae527 + f663d5690bfe8e442a8c3e9fff9b6735014fbec4 https://github.com/dotnet/diagnostics diff --git a/eng/Versions.props b/eng/Versions.props index 0d9639ad1f4..6f140efbc9b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,9 +48,9 @@ --> - 9.0.0-beta.24253.1 - 9.0.0-beta.24253.1 - 9.0.0-beta.24253.1 + 9.0.0-beta.24257.1 + 9.0.0-beta.24257.1 + 9.0.0-beta.24257.1 9.0.0-preview.5.24251.4 9.0.0-preview.5.24251.4 diff --git a/eng/common/core-templates/job/source-index-stage1.yml b/eng/common/core-templates/job/source-index-stage1.yml index 9c6e5ae3c3e..f1938eec102 100644 --- a/eng/common/core-templates/job/source-index-stage1.yml +++ b/eng/common/core-templates/job/source-index-stage1.yml @@ -1,6 +1,7 @@ parameters: runAsPublic: false - sourceIndexPackageVersion: 1.0.1-20240129.2 + sourceIndexUploadPackageVersion: 2.0.0-20240502.12 + sourceIndexProcessBinlogPackageVersion: 1.0.1-20240129.2 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: [] @@ -15,14 +16,14 @@ jobs: dependsOn: ${{ parameters.dependsOn }} condition: ${{ parameters.condition }} variables: - - name: SourceIndexPackageVersion - value: ${{ parameters.sourceIndexPackageVersion }} + - name: SourceIndexUploadPackageVersion + value: ${{ parameters.sourceIndexUploadPackageVersion }} + - name: SourceIndexProcessBinlogPackageVersion + value: ${{ parameters.sourceIndexProcessBinlogPackageVersion }} - name: SourceIndexPackageSource value: ${{ parameters.sourceIndexPackageSource }} - name: BinlogPath value: ${{ parameters.binlogPath }} - - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - group: source-dot-net stage1 variables - template: /eng/common/core-templates/variables/pool-providers.yml parameters: is1ESPipeline: ${{ parameters.is1ESPipeline }} @@ -54,8 +55,8 @@ jobs: workingDirectory: $(Agent.TempDirectory) - script: | - $(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version $(SourceIndexPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools - $(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version $(SourceIndexPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools + $(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version $(sourceIndexProcessBinlogPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools + $(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version $(sourceIndexUploadPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools displayName: Download Tools # Set working directory to temp directory so 'dotnet' doesn't try to use global.json and use the repo's sdk. workingDirectory: $(Agent.TempDirectory) @@ -67,7 +68,24 @@ jobs: displayName: Process Binlog into indexable sln - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - script: $(Agent.TempDirectory)/.source-index/tools/UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name) - displayName: Upload stage1 artifacts to source index - env: - BLOB_CONTAINER_URL: $(source-dot-net-stage1-blob-container-url) + - task: AzureCLI@2 + displayName: Get stage 1 auth token + inputs: + azureSubscription: 'SourceDotNet Stage1 Publish' + addSpnToEnvironment: true + scriptType: 'ps' + scriptLocation: 'inlineScript' + inlineScript: | + echo "##vso[task.setvariable variable=ARM_CLIENT_ID]$env:servicePrincipalId" + echo "##vso[task.setvariable variable=ARM_ID_TOKEN]$env:idToken" + echo "##vso[task.setvariable variable=ARM_TENANT_ID]$env:tenantId" + + - script: | + echo "Client ID: $(ARM_CLIENT_ID)" + echo "ID Token: $(ARM_ID_TOKEN)" + echo "Tenant ID: $(ARM_TENANT_ID)" + az login --service-principal -u $(ARM_CLIENT_ID) --tenant $(ARM_TENANT_ID) --allow-no-subscriptions --federated-token $(ARM_ID_TOKEN) + displayName: "Login to Azure" + + - script: $(Agent.TempDirectory)/.source-index/tools/UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name) -s netsourceindexstage1 -b stage1 + displayName: Upload stage1 artifacts to source index \ No newline at end of file diff --git a/eng/common/core-templates/post-build/post-build.yml b/eng/common/core-templates/post-build/post-build.yml index ed1e6692f73..865bc1ecb4f 100644 --- a/eng/common/core-templates/post-build/post-build.yml +++ b/eng/common/core-templates/post-build/post-build.yml @@ -115,9 +115,13 @@ stages: os: windows # If it's not devdiv, it's dnceng ${{ else }}: - name: $(DncEngInternalBuildPool) - image: 1es-windows-2022 - os: windows + ${{ if eq(parameters.is1ESPipeline, true) }}: + name: $(DncEngInternalBuildPool) + image: windows.vs2022.amd64 + os: windows + ${{ else }}: + name: $(DncEngInternalBuildPool) + demands: ImageOverride -equals windows.vs2022.amd64 steps: - template: /eng/common/core-templates/post-build/setup-maestro-vars.yml @@ -156,9 +160,13 @@ stages: os: windows # If it's not devdiv, it's dnceng ${{ else }}: - name: $(DncEngInternalBuildPool) - image: 1es-windows-2022 - os: windows + ${{ if eq(parameters.is1ESPipeline, true) }}: + name: $(DncEngInternalBuildPool) + image: 1es-windows-2022 + os: windows + ${{ else }}: + name: $(DncEngInternalBuildPool) + demands: ImageOverride -equals windows.vs2022.amd64 steps: - template: /eng/common/core-templates/post-build/setup-maestro-vars.yml parameters: @@ -216,9 +224,13 @@ stages: os: windows # If it's not devdiv, it's dnceng ${{ else }}: - name: $(DncEngInternalBuildPool) - image: 1es-windows-2022 - os: windows + ${{ if eq(parameters.is1ESPipeline, true) }}: + name: $(DncEngInternalBuildPool) + image: 1es-windows-2022 + os: windows + ${{ else }}: + name: $(DncEngInternalBuildPool) + demands: ImageOverride -equals windows.vs2022.amd64 steps: - template: /eng/common/core-templates/post-build/setup-maestro-vars.yml parameters: @@ -273,9 +285,13 @@ stages: os: windows # If it's not devdiv, it's dnceng ${{ else }}: - name: NetCore1ESPool-Publishing-Internal - image: windows.vs2019.amd64 - os: windows + ${{ if eq(parameters.is1ESPipeline, true) }}: + name: NetCore1ESPool-Publishing-Internal + image: windows.vs2019.amd64 + os: windows + ${{ else }}: + name: NetCore1ESPool-Publishing-Internal + demands: ImageOverride -equals windows.vs2019.amd64 steps: - template: /eng/common/core-templates/post-build/setup-maestro-vars.yml parameters: diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index ed1bfeda3c9..0eee929ed8e 100644 --- a/eng/common/cross/build-rootfs.sh +++ b/eng/common/cross/build-rootfs.sh @@ -451,13 +451,32 @@ fi mkdir -p "$__RootfsDir" __RootfsDir="$( cd "$__RootfsDir" && pwd )" +__hasWget= +ensureDownloadTool() +{ + if command -v wget &> /dev/null; then + __hasWget=1 + elif command -v curl &> /dev/null; then + __hasWget=0 + else + >&2 echo "ERROR: either wget or curl is required by this script." + exit 1 + fi +} + if [[ "$__CodeName" == "alpine" ]]; then __ApkToolsVersion=2.12.11 __ApkToolsDir="$(mktemp -d)" __ApkKeysDir="$(mktemp -d)" - arch="$(uname -m)" - wget "https://gitlab.alpinelinux.org/api/v4/projects/5/packages/generic/v$__ApkToolsVersion/$arch/apk.static" -P "$__ApkToolsDir" + + ensureDownloadTool() + + if [[ "$__hasWget" == 1 ]]; then + wget -P "$__ApkToolsDir" "https://gitlab.alpinelinux.org/api/v4/projects/5/packages/generic/v$__ApkToolsVersion/$arch/apk.static" + else + curl -SLO --create-dirs --output-dir "$__ApkToolsDir" "https://gitlab.alpinelinux.org/api/v4/projects/5/packages/generic/v$__ApkToolsVersion/$arch/apk.static" + fi if [[ "$arch" == "x86_64" ]]; then __ApkToolsSHA512SUM="53e57b49230da07ef44ee0765b9592580308c407a8d4da7125550957bb72cb59638e04f8892a18b584451c8d841d1c7cb0f0ab680cc323a3015776affaa3be33" elif [[ "$arch" == "aarch64" ]]; then @@ -520,12 +539,23 @@ if [[ "$__CodeName" == "alpine" ]]; then elif [[ "$__CodeName" == "freebsd" ]]; then mkdir -p "$__RootfsDir"/usr/local/etc JOBS=${MAXJOBS:="$(getconf _NPROCESSORS_ONLN)"} - wget -O - "https://download.freebsd.org/ftp/releases/${__FreeBSDArch}/${__FreeBSDMachineArch}/${__FreeBSDBase}/base.txz" | tar -C "$__RootfsDir" -Jxf - ./lib ./usr/lib ./usr/libdata ./usr/include ./usr/share/keys ./etc ./bin/freebsd-version + + ensureDownloadTool() + + if [[ "$__hasWget" == 1 ]]; then + wget -O- "https://download.freebsd.org/ftp/releases/${__FreeBSDArch}/${__FreeBSDMachineArch}/${__FreeBSDBase}/base.txz" | tar -C "$__RootfsDir" -Jxf - ./lib ./usr/lib ./usr/libdata ./usr/include ./usr/share/keys ./etc ./bin/freebsd-version + else + curl -SL "https://download.freebsd.org/ftp/releases/${__FreeBSDArch}/${__FreeBSDMachineArch}/${__FreeBSDBase}/base.txz" | tar -C "$__RootfsDir" -Jxf - ./lib ./usr/lib ./usr/libdata ./usr/include ./usr/share/keys ./etc ./bin/freebsd-version + fi echo "ABI = \"FreeBSD:${__FreeBSDABI}:${__FreeBSDMachineArch}\"; FINGERPRINTS = \"${__RootfsDir}/usr/share/keys\"; REPOS_DIR = [\"${__RootfsDir}/etc/pkg\"]; REPO_AUTOUPDATE = NO; RUN_SCRIPTS = NO;" > "${__RootfsDir}"/usr/local/etc/pkg.conf echo "FreeBSD: { url: \"pkg+http://pkg.FreeBSD.org/\${ABI}/quarterly\", mirror_type: \"srv\", signature_type: \"fingerprints\", fingerprints: \"${__RootfsDir}/usr/share/keys/pkg\", enabled: yes }" > "${__RootfsDir}"/etc/pkg/FreeBSD.conf mkdir -p "$__RootfsDir"/tmp # get and build package manager - wget -O - "https://github.com/freebsd/pkg/archive/${__FreeBSDPkg}.tar.gz" | tar -C "$__RootfsDir"/tmp -zxf - + if [[ "$__hasWget" == 1 ]]; then + wget -O- "https://github.com/freebsd/pkg/archive/${__FreeBSDPkg}.tar.gz" | tar -C "$__RootfsDir"/tmp -zxf - + else + curl -SL "https://github.com/freebsd/pkg/archive/${__FreeBSDPkg}.tar.gz" | tar -C "$__RootfsDir"/tmp -zxf - + fi cd "$__RootfsDir/tmp/pkg-${__FreeBSDPkg}" # needed for install to succeed mkdir -p "$__RootfsDir"/host/etc @@ -539,15 +569,30 @@ elif [[ "$__CodeName" == "illumos" ]]; then mkdir "$__RootfsDir/tmp" pushd "$__RootfsDir/tmp" JOBS=${MAXJOBS:="$(getconf _NPROCESSORS_ONLN)"} + + ensureDownloadTool() + echo "Downloading sysroot." - wget -O - https://github.com/illumos/sysroot/releases/download/20181213-de6af22ae73b-v1/illumos-sysroot-i386-20181213-de6af22ae73b-v1.tar.gz | tar -C "$__RootfsDir" -xzf - + if [[ "$__hasWget" == 1 ]]; then + wget -O- https://github.com/illumos/sysroot/releases/download/20181213-de6af22ae73b-v1/illumos-sysroot-i386-20181213-de6af22ae73b-v1.tar.gz | tar -C "$__RootfsDir" -xzf - + else + curl -SL https://github.com/illumos/sysroot/releases/download/20181213-de6af22ae73b-v1/illumos-sysroot-i386-20181213-de6af22ae73b-v1.tar.gz | tar -C "$__RootfsDir" -xzf - + fi echo "Building binutils. Please wait.." - wget -O - https://ftp.gnu.org/gnu/binutils/binutils-2.33.1.tar.bz2 | tar -xjf - + if [[ "$__hasWget" == 1 ]]; then + wget -O- https://ftp.gnu.org/gnu/binutils/binutils-2.33.1.tar.bz2 | tar -xjf - + else + curl -SL https://ftp.gnu.org/gnu/binutils/binutils-2.33.1.tar.bz2 | tar -xjf - + fi mkdir build-binutils && cd build-binutils ../binutils-2.33.1/configure --prefix="$__RootfsDir" --target="${__illumosArch}-sun-solaris2.10" --program-prefix="${__illumosArch}-illumos-" --with-sysroot="$__RootfsDir" make -j "$JOBS" && make install && cd .. echo "Building gcc. Please wait.." - wget -O - https://ftp.gnu.org/gnu/gcc/gcc-8.4.0/gcc-8.4.0.tar.xz | tar -xJf - + if [[ "$__hasWget" == 1 ]]; then + wget -O- https://ftp.gnu.org/gnu/gcc/gcc-8.4.0/gcc-8.4.0.tar.xz | tar -xJf - + else + curl -SL https://ftp.gnu.org/gnu/gcc/gcc-8.4.0/gcc-8.4.0.tar.xz | tar -xJf - + fi CFLAGS="-fPIC" CXXFLAGS="-fPIC" CXXFLAGS_FOR_TARGET="-fPIC" @@ -564,7 +609,11 @@ elif [[ "$__CodeName" == "illumos" ]]; then fi BaseUrl="$BaseUrl/packages/SmartOS/trunk/${__illumosArch}/All" echo "Downloading manifest" - wget "$BaseUrl" + if [[ "$__hasWget" == 1 ]]; then + wget "$BaseUrl" + else + curl -SLO "$BaseUrl" + fi echo "Downloading dependencies." read -ra array <<<"$__IllumosPackages" for package in "${array[@]}"; do @@ -572,7 +621,11 @@ elif [[ "$__CodeName" == "illumos" ]]; then # find last occurrence of package in listing and extract its name package="$(sed -En '/.*href="('"$package"'-[0-9].*).tgz".*/h;$!d;g;s//\1/p' All)" echo "Resolved name '$package'" - wget "$BaseUrl"/"$package".tgz + if [[ "$__hasWget" == 1 ]]; then + wget "$BaseUrl"/"$package".tgz + else + curl -SLO "$BaseUrl"/"$package".tgz + fi ar -x "$package".tgz tar --skip-old-files -xzf "$package".tmp.tg* -C "$__RootfsDir" 2>/dev/null done @@ -581,10 +634,17 @@ elif [[ "$__CodeName" == "illumos" ]]; then rm -rf "$__RootfsDir"/{tmp,+*} mkdir -p "$__RootfsDir"/usr/include/net mkdir -p "$__RootfsDir"/usr/include/netpacket - wget -P "$__RootfsDir"/usr/include/net https://raw.githubusercontent.com/illumos/illumos-gate/master/usr/src/uts/common/io/bpf/net/bpf.h - wget -P "$__RootfsDir"/usr/include/net https://raw.githubusercontent.com/illumos/illumos-gate/master/usr/src/uts/common/io/bpf/net/dlt.h - wget -P "$__RootfsDir"/usr/include/netpacket https://raw.githubusercontent.com/illumos/illumos-gate/master/usr/src/uts/common/inet/sockmods/netpacket/packet.h - wget -P "$__RootfsDir"/usr/include/sys https://raw.githubusercontent.com/illumos/illumos-gate/master/usr/src/uts/common/sys/sdt.h + if [[ "$__hasWget" == 1 ]]; then + wget -P "$__RootfsDir"/usr/include/net https://raw.githubusercontent.com/illumos/illumos-gate/master/usr/src/uts/common/io/bpf/net/bpf.h + wget -P "$__RootfsDir"/usr/include/net https://raw.githubusercontent.com/illumos/illumos-gate/master/usr/src/uts/common/io/bpf/net/dlt.h + wget -P "$__RootfsDir"/usr/include/netpacket https://raw.githubusercontent.com/illumos/illumos-gate/master/usr/src/uts/common/inet/sockmods/netpacket/packet.h + wget -P "$__RootfsDir"/usr/include/sys https://raw.githubusercontent.com/illumos/illumos-gate/master/usr/src/uts/common/sys/sdt.h + else + curl -SLO --create-dirs --output-dir "$__RootfsDir"/usr/include/net https://raw.githubusercontent.com/illumos/illumos-gate/master/usr/src/uts/common/io/bpf/net/bpf.h + curl -SLO --create-dirs --output-dir "$__RootfsDir"/usr/include/net https://raw.githubusercontent.com/illumos/illumos-gate/master/usr/src/uts/common/io/bpf/net/dlt.h + curl -SLO --create-dirs --output-dir "$__RootfsDir"/usr/include/netpacket https://raw.githubusercontent.com/illumos/illumos-gate/master/usr/src/uts/common/inet/sockmods/netpacket/packet.h + curl -SLO --create-dirs --output-dir "$__RootfsDir"/usr/include/sys https://raw.githubusercontent.com/illumos/illumos-gate/master/usr/src/uts/common/sys/sdt.h + fi elif [[ "$__CodeName" == "haiku" ]]; then JOBS=${MAXJOBS:="$(getconf _NPROCESSORS_ONLN)"} @@ -594,9 +654,16 @@ elif [[ "$__CodeName" == "haiku" ]]; then mkdir "$__RootfsDir/tmp/download" + ensureDownloadTool() + echo "Downloading Haiku package tool" git clone https://github.com/haiku/haiku-toolchains-ubuntu --depth 1 "$__RootfsDir/tmp/script" - wget -O "$__RootfsDir/tmp/download/hosttools.zip" "$("$__RootfsDir/tmp/script/fetch.sh" --hosttools)" + if [[ "$__hasWget" == 1 ]]; then + wget -O "$__RootfsDir/tmp/download/hosttools.zip" "$("$__RootfsDir/tmp/script/fetch.sh" --hosttools)" + else + curl -SLo "$__RootfsDir/tmp/download/hosttools.zip" "$("$__RootfsDir/tmp/script/fetch.sh" --hosttools)" + fi + unzip -o "$__RootfsDir/tmp/download/hosttools.zip" -d "$__RootfsDir/tmp/bin" DepotBaseUrl="https://depot.haiku-os.org/__api/v2/pkg/get-pkg" @@ -609,14 +676,25 @@ elif [[ "$__CodeName" == "haiku" ]]; then echo "Downloading $package..." # API documented here: https://github.com/haiku/haikudepotserver/blob/master/haikudepotserver-api2/src/main/resources/api2/pkg.yaml#L60 # The schema here: https://github.com/haiku/haikudepotserver/blob/master/haikudepotserver-api2/src/main/resources/api2/pkg.yaml#L598 - hpkgDownloadUrl="$(wget -qO- --post-data='{"name":"'"$package"'","repositorySourceCode":"haikuports_'$__HaikuArch'","versionType":"LATEST","naturalLanguageCode":"en"}' \ - --header='Content-Type:application/json' "$DepotBaseUrl" | jq -r '.result.versions[].hpkgDownloadURL')" - wget -P "$__RootfsDir/tmp/download" "$hpkgDownloadUrl" + if [[ "$__hasWget" == 1 ]]; then + hpkgDownloadUrl="$(wget -qO- --post-data '{"name":"'"$package"'","repositorySourceCode":"haikuports_'$__HaikuArch'","versionType":"LATEST","naturalLanguageCode":"en"}' \ + --header 'Content-Type:application/json' "$DepotBaseUrl" | jq -r '.result.versions[].hpkgDownloadURL')" + wget -P "$__RootfsDir/tmp/download" "$hpkgDownloadUrl" + else + hpkgDownloadUrl="$(curl -sSL -XPOST --data '{"name":"'"$package"'","repositorySourceCode":"haikuports_'$__HaikuArch'","versionType":"LATEST","naturalLanguageCode":"en"}' \ + --header 'Content-Type:application/json' "$DepotBaseUrl" | jq -r '.result.versions[].hpkgDownloadURL')" + curl -SLO --create-dirs --output-dir "$__RootfsDir/tmp/download" "$hpkgDownloadUrl" + fi done for package in haiku haiku_devel; do echo "Downloading $package..." - hpkgVersion="$(wget -qO- $HpkgBaseUrl | sed -n 's/^.*version: "\([^"]*\)".*$/\1/p')" - wget -P "$__RootfsDir/tmp/download" "$HpkgBaseUrl/packages/$package-$hpkgVersion-1-$__HaikuArch.hpkg" + if [[ "$__hasWget" == 1 ]]; then + hpkgVersion="$(wget -qO- "$HpkgBaseUrl" | sed -n 's/^.*version: "\([^"]*\)".*$/\1/p')" + wget -P "$__RootfsDir/tmp/download" "$HpkgBaseUrl/packages/$package-$hpkgVersion-1-$__HaikuArch.hpkg" + else + hpkgVersion="$(curl -sSL "$HpkgBaseUrl" | sed -n 's/^.*version: "\([^"]*\)".*$/\1/p')" + curl -SLO --create-dirs --output-dir "$__RootfsDir/tmp/download" "$HpkgBaseUrl/packages/$package-$hpkgVersion-1-$__HaikuArch.hpkg" + fi done # Set up the sysroot @@ -629,7 +707,11 @@ elif [[ "$__CodeName" == "haiku" ]]; then # Download buildtools echo "Downloading Haiku buildtools" - wget -O "$__RootfsDir/tmp/download/buildtools.zip" "$("$__RootfsDir/tmp/script/fetch.sh" --buildtools --arch=$__HaikuArch)" + if [[ "$__hasWget" == 1 ]]; then + wget -O "$__RootfsDir/tmp/download/buildtools.zip" "$("$__RootfsDir/tmp/script/fetch.sh" --buildtools --arch=$__HaikuArch)" + else + curl -SLo "$__RootfsDir/tmp/download/buildtools.zip" "$("$__RootfsDir/tmp/script/fetch.sh" --buildtools --arch=$__HaikuArch)" + fi unzip -o "$__RootfsDir/tmp/download/buildtools.zip" -d "$__RootfsDir" # Cleaning up temporary files diff --git a/eng/common/native/init-distro-rid.sh b/eng/common/native/init-distro-rid.sh index 228be0b1598..83ea7aab0e0 100644 --- a/eng/common/native/init-distro-rid.sh +++ b/eng/common/native/init-distro-rid.sh @@ -20,10 +20,6 @@ getNonPortableDistroRid() # shellcheck disable=SC1091 if [ -e "${rootfsDir}/etc/os-release" ]; then . "${rootfsDir}/etc/os-release" - if [ "${ID}" = "rhel" ] || [ "${ID}" = "rocky" ] || [ "${ID}" = "alpine" ] || [ "${ID}" = "ol" ]; then - VERSION_ID="${VERSION_ID%.*}" # Remove the last version digit for these distros - fi - if echo "${VERSION_ID:-}" | grep -qE '^([[:digit:]]|\.)+$'; then nonPortableRid="${ID}.${VERSION_ID}-${targetArch}" else @@ -48,19 +44,7 @@ getNonPortableDistroRid() nonPortableRid="android.$__android_sdk_version-${targetArch}" elif [ "$targetOs" = "illumos" ]; then __uname_version=$(uname -v) - case "$__uname_version" in - omnios-*) - __omnios_major_version=$(echo "$__uname_version" | cut -c9-10) - nonPortableRid="omnios.$__omnios_major_version-${targetArch}" - ;; - joyent_*) - __smartos_major_version=$(echo "$__uname_version" | cut -c9-10) - nonPortableRid="smartos.$__smartos_major_version-${targetArch}" - ;; - *) - nonPortableRid="illumos-${targetArch}" - ;; - esac + nonPortableRid="illumos-${targetArch}" elif [ "$targetOs" = "solaris" ]; then __uname_version=$(uname -v) __solaris_major_version=$(echo "$__uname_version" | cut -d'.' -f1) diff --git a/global.json b/global.json index dc50703cc05..c00ca92f10f 100644 --- a/global.json +++ b/global.json @@ -31,7 +31,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24253.1", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24253.1" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24257.1", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24257.1" } } From 0a1e11fd3d9f94e2171889996efa776638efbbf2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 7 May 2024 08:26:10 -0700 Subject: [PATCH 183/568] Update dependencies from https://github.com/dotnet/installer build 20240507.2 (#6588) Microsoft.Dotnet.Sdk.Internal From Version 9.0.100-preview.5.24253.16 -> To Version 9.0.100-preview.5.24257.2 Dependency coherency updates Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0 From Version 9.0.0-preview.5.24251.4 -> To Version 9.0.0-preview.5.24256.2 (parent: Microsoft.Dotnet.Sdk.Internal Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b4ffcdcb364..01cc103b978 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/aspnetcore - 83b527e6a42d6729df191de8e4aa3fdfdb0d5709 + da3aa27233a2cec2f6780884f71934b2f5e686ce https://github.com/dotnet/diagnostics @@ -38,9 +38,9 @@ https://github.com/dotnet/arcade f663d5690bfe8e442a8c3e9fff9b6735014fbec4 - + https://github.com/dotnet/installer - fa261b952d702c6bd604728fcbdb58ac071a22b1 + 6c72a489da99211c821ab14001b776350fe86722 https://github.com/dotnet/arcade @@ -50,17 +50,17 @@ https://github.com/dotnet/diagnostics e5f6b52bb66e75d1b56945b2d1a5773289e544e4 - + https://github.com/dotnet/runtime - 4326eb7ed4d03f30ce4a4de1eb028ee76fdaaa3c + 84b33395057737db3ea342a5151feb6b90c1b6f6 - + https://github.com/dotnet/aspnetcore - 83b527e6a42d6729df191de8e4aa3fdfdb0d5709 + da3aa27233a2cec2f6780884f71934b2f5e686ce - + https://github.com/dotnet/runtime - 4326eb7ed4d03f30ce4a4de1eb028ee76fdaaa3c + 84b33395057737db3ea342a5151feb6b90c1b6f6 diff --git a/eng/Versions.props b/eng/Versions.props index 6f140efbc9b..7a95adae2d3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,20 +52,20 @@ 9.0.0-beta.24257.1 9.0.0-beta.24257.1 - 9.0.0-preview.5.24251.4 - 9.0.0-preview.5.24251.4 + 9.0.0-preview.5.24256.2 + 9.0.0-preview.5.24256.2 2.0.0-beta4.24209.3 8.0.0-preview.24256.1 8.0.0-preview.24256.1 - 9.0.100-preview.5.24253.16 + 9.0.100-preview.5.24257.2 9.0.0-preview.24225.1 - 9.0.0-preview.4.24251.3 - 9.0.0-preview.4.24251.3 + 9.0.0-preview.5.24256.1 + 9.0.0-preview.5.24256.1 8.0.0-preview.24256.1 From 1424a4b7d78a57c371b96e95e3da8734849073a7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 8 May 2024 14:01:51 +0000 Subject: [PATCH 184/568] Update dependencies from https://github.com/dotnet/diagnostics build 20240507.1 (#6590) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 6 +++--- eng/Versions.props | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 01cc103b978..72bb881ebc7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,11 +4,11 @@ https://github.com/dotnet/aspnetcore da3aa27233a2cec2f6780884f71934b2f5e686ce - + https://github.com/dotnet/diagnostics e5f6b52bb66e75d1b56945b2d1a5773289e544e4 - + https://github.com/dotnet/diagnostics e5f6b52bb66e75d1b56945b2d1a5773289e544e4 @@ -46,7 +46,7 @@ https://github.com/dotnet/arcade f663d5690bfe8e442a8c3e9fff9b6735014fbec4 - + https://github.com/dotnet/diagnostics e5f6b52bb66e75d1b56945b2d1a5773289e544e4 diff --git a/eng/Versions.props b/eng/Versions.props index 7a95adae2d3..c00ea0425ca 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24209.3 - 8.0.0-preview.24256.1 - 8.0.0-preview.24256.1 + 8.0.0-preview.24257.1 + 8.0.0-preview.24257.1 9.0.100-preview.5.24257.2 @@ -67,7 +67,7 @@ 9.0.0-preview.5.24256.1 9.0.0-preview.5.24256.1 - 8.0.0-preview.24256.1 + 8.0.0-preview.24257.1 $(MicrosoftNETCoreApp31Version) From 2c33a78588e53f3fcc2e1e43233a267272241abc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 8 May 2024 14:40:05 +0000 Subject: [PATCH 185/568] Update dependencies from https://github.com/dotnet/arcade build 20240508.1 (#6591) [feature/9.x] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- eng/common/cross/build-rootfs.sh | 8 ++++---- global.json | 4 ++-- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 72bb881ebc7..204efa30570 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,29 +22,29 @@ https://github.com/dotnet/roslyn-analyzers 8dccccec1ce3bd2fb532ec77d7e092ab9d684db7 - + https://github.com/dotnet/arcade - f663d5690bfe8e442a8c3e9fff9b6735014fbec4 + a62b4639193b96a1a848ccddaf9fe421c3d3f21b - + https://github.com/dotnet/arcade - f663d5690bfe8e442a8c3e9fff9b6735014fbec4 + a62b4639193b96a1a848ccddaf9fe421c3d3f21b - + https://github.com/dotnet/arcade - f663d5690bfe8e442a8c3e9fff9b6735014fbec4 + a62b4639193b96a1a848ccddaf9fe421c3d3f21b - + https://github.com/dotnet/arcade - f663d5690bfe8e442a8c3e9fff9b6735014fbec4 + a62b4639193b96a1a848ccddaf9fe421c3d3f21b https://github.com/dotnet/installer 6c72a489da99211c821ab14001b776350fe86722 - + https://github.com/dotnet/arcade - f663d5690bfe8e442a8c3e9fff9b6735014fbec4 + a62b4639193b96a1a848ccddaf9fe421c3d3f21b https://github.com/dotnet/diagnostics diff --git a/eng/Versions.props b/eng/Versions.props index c00ea0425ca..2cdafc1f960 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,9 +48,9 @@ --> - 9.0.0-beta.24257.1 - 9.0.0-beta.24257.1 - 9.0.0-beta.24257.1 + 9.0.0-beta.24258.1 + 9.0.0-beta.24258.1 + 9.0.0-beta.24258.1 9.0.0-preview.5.24256.2 9.0.0-preview.5.24256.2 diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index 0eee929ed8e..a8e35df7cee 100644 --- a/eng/common/cross/build-rootfs.sh +++ b/eng/common/cross/build-rootfs.sh @@ -470,7 +470,7 @@ if [[ "$__CodeName" == "alpine" ]]; then __ApkKeysDir="$(mktemp -d)" arch="$(uname -m)" - ensureDownloadTool() + ensureDownloadTool if [[ "$__hasWget" == 1 ]]; then wget -P "$__ApkToolsDir" "https://gitlab.alpinelinux.org/api/v4/projects/5/packages/generic/v$__ApkToolsVersion/$arch/apk.static" @@ -540,7 +540,7 @@ elif [[ "$__CodeName" == "freebsd" ]]; then mkdir -p "$__RootfsDir"/usr/local/etc JOBS=${MAXJOBS:="$(getconf _NPROCESSORS_ONLN)"} - ensureDownloadTool() + ensureDownloadTool if [[ "$__hasWget" == 1 ]]; then wget -O- "https://download.freebsd.org/ftp/releases/${__FreeBSDArch}/${__FreeBSDMachineArch}/${__FreeBSDBase}/base.txz" | tar -C "$__RootfsDir" -Jxf - ./lib ./usr/lib ./usr/libdata ./usr/include ./usr/share/keys ./etc ./bin/freebsd-version @@ -570,7 +570,7 @@ elif [[ "$__CodeName" == "illumos" ]]; then pushd "$__RootfsDir/tmp" JOBS=${MAXJOBS:="$(getconf _NPROCESSORS_ONLN)"} - ensureDownloadTool() + ensureDownloadTool echo "Downloading sysroot." if [[ "$__hasWget" == 1 ]]; then @@ -654,7 +654,7 @@ elif [[ "$__CodeName" == "haiku" ]]; then mkdir "$__RootfsDir/tmp/download" - ensureDownloadTool() + ensureDownloadTool echo "Downloading Haiku package tool" git clone https://github.com/haiku/haiku-toolchains-ubuntu --depth 1 "$__RootfsDir/tmp/script" diff --git a/global.json b/global.json index c00ca92f10f..401b8f3a5c2 100644 --- a/global.json +++ b/global.json @@ -31,7 +31,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24257.1", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24257.1" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24258.1", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24258.1" } } From 3c671210c5fbfa3fa11c7345f31dcc6a701aaaa3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 8 May 2024 08:54:52 -0700 Subject: [PATCH 186/568] Update dependencies from https://github.com/dotnet/installer build 20240508.1 (#6592) Microsoft.Dotnet.Sdk.Internal From Version 9.0.100-preview.5.24257.2 -> To Version 9.0.100-preview.5.24258.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 204efa30570..e82bbf14e3a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -38,9 +38,9 @@ https://github.com/dotnet/arcade a62b4639193b96a1a848ccddaf9fe421c3d3f21b - + https://github.com/dotnet/installer - 6c72a489da99211c821ab14001b776350fe86722 + 05ec25e1549a0653393a4f6782b4af6a0cbfbcf0 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 2cdafc1f960..4bd54c639c9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -60,7 +60,7 @@ 8.0.0-preview.24257.1 8.0.0-preview.24257.1 - 9.0.100-preview.5.24257.2 + 9.0.100-preview.5.24258.1 9.0.0-preview.24225.1 From f73f721f3350647d7d1083fe5555a61ca7fdaf09 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 10 May 2024 14:07:56 +0000 Subject: [PATCH 187/568] Update dependencies from https://github.com/dotnet/diagnostics build 20240509.1 (#6606) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e82bbf14e3a..f5dd4a32f62 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore da3aa27233a2cec2f6780884f71934b2f5e686ce - + https://github.com/dotnet/diagnostics - e5f6b52bb66e75d1b56945b2d1a5773289e544e4 + a9efc2e9a04c86be5f66995522f63679ced519c7 - + https://github.com/dotnet/diagnostics - e5f6b52bb66e75d1b56945b2d1a5773289e544e4 + a9efc2e9a04c86be5f66995522f63679ced519c7 https://github.com/dotnet/command-line-api @@ -46,9 +46,9 @@ https://github.com/dotnet/arcade a62b4639193b96a1a848ccddaf9fe421c3d3f21b - + https://github.com/dotnet/diagnostics - e5f6b52bb66e75d1b56945b2d1a5773289e544e4 + a9efc2e9a04c86be5f66995522f63679ced519c7 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 4bd54c639c9..e899b30a258 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24209.3 - 8.0.0-preview.24257.1 - 8.0.0-preview.24257.1 + 8.0.0-preview.24259.1 + 8.0.0-preview.24259.1 9.0.100-preview.5.24258.1 @@ -67,7 +67,7 @@ 9.0.0-preview.5.24256.1 9.0.0-preview.5.24256.1 - 8.0.0-preview.24257.1 + 8.0.0-preview.24259.1 $(MicrosoftNETCoreApp31Version) From c1a1f78fb82e3595aa2d134f4e6d988a6b9cfa9e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 12 May 2024 14:19:19 +0000 Subject: [PATCH 188/568] [feature/9.x] Update dependencies from dotnet/arcade (#6608) [feature/9.x] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- global.json | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f5dd4a32f62..9b9803af735 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,29 +22,29 @@ https://github.com/dotnet/roslyn-analyzers 8dccccec1ce3bd2fb532ec77d7e092ab9d684db7 - + https://github.com/dotnet/arcade - a62b4639193b96a1a848ccddaf9fe421c3d3f21b + 480401b003bfd2eb989c315da5d6b99ad13a968c - + https://github.com/dotnet/arcade - a62b4639193b96a1a848ccddaf9fe421c3d3f21b + 480401b003bfd2eb989c315da5d6b99ad13a968c - + https://github.com/dotnet/arcade - a62b4639193b96a1a848ccddaf9fe421c3d3f21b + 480401b003bfd2eb989c315da5d6b99ad13a968c - + https://github.com/dotnet/arcade - a62b4639193b96a1a848ccddaf9fe421c3d3f21b + 480401b003bfd2eb989c315da5d6b99ad13a968c https://github.com/dotnet/installer 05ec25e1549a0653393a4f6782b4af6a0cbfbcf0 - + https://github.com/dotnet/arcade - a62b4639193b96a1a848ccddaf9fe421c3d3f21b + 480401b003bfd2eb989c315da5d6b99ad13a968c https://github.com/dotnet/diagnostics diff --git a/eng/Versions.props b/eng/Versions.props index e899b30a258..382a43d733e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,9 +48,9 @@ --> - 9.0.0-beta.24258.1 - 9.0.0-beta.24258.1 - 9.0.0-beta.24258.1 + 9.0.0-beta.24260.2 + 9.0.0-beta.24260.2 + 9.0.0-beta.24260.2 9.0.0-preview.5.24256.2 9.0.0-preview.5.24256.2 diff --git a/global.json b/global.json index 401b8f3a5c2..5792c862d0b 100644 --- a/global.json +++ b/global.json @@ -31,7 +31,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24258.1", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24258.1" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24260.2", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24260.2" } } From 4a386b8e13661216e976c3cbcbeb2bf0aafbea0e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 14 May 2024 12:35:38 +0000 Subject: [PATCH 189/568] Update dependencies from https://github.com/dotnet/diagnostics build 20240513.1 Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe , Microsoft.FileFormats From Version 8.0.0-preview.24259.1 -> To Version 8.0.0-preview.24263.1 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9b9803af735..9da3240c7cb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore da3aa27233a2cec2f6780884f71934b2f5e686ce - + https://github.com/dotnet/diagnostics - a9efc2e9a04c86be5f66995522f63679ced519c7 + 363760fa9a030cbd6c8eb73e7352c8728ba62a9a - + https://github.com/dotnet/diagnostics - a9efc2e9a04c86be5f66995522f63679ced519c7 + 363760fa9a030cbd6c8eb73e7352c8728ba62a9a https://github.com/dotnet/command-line-api @@ -46,9 +46,9 @@ https://github.com/dotnet/arcade 480401b003bfd2eb989c315da5d6b99ad13a968c - + https://github.com/dotnet/diagnostics - a9efc2e9a04c86be5f66995522f63679ced519c7 + 363760fa9a030cbd6c8eb73e7352c8728ba62a9a https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 382a43d733e..f11d0d0dcdb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24209.3 - 8.0.0-preview.24259.1 - 8.0.0-preview.24259.1 + 8.0.0-preview.24263.1 + 8.0.0-preview.24263.1 9.0.100-preview.5.24258.1 @@ -67,7 +67,7 @@ 9.0.0-preview.5.24256.1 9.0.0-preview.5.24256.1 - 8.0.0-preview.24259.1 + 8.0.0-preview.24263.1 $(MicrosoftNETCoreApp31Version) From 06949920914797303155acd01345c9af802fd0d9 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 15 May 2024 04:05:07 +0000 Subject: [PATCH 190/568] Update release information (#6622) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index f11d0d0dcdb..3d4ad0dec6f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -5,7 +5,7 @@ https://github.com/dotnet/dotnet-monitor 9.0.0 preview - 4 + 5 true 2.0.0-beta4.24209.3 - 8.0.0-preview.24263.1 - 8.0.0-preview.24263.1 + 8.0.0-preview.24264.1 + 8.0.0-preview.24264.1 9.0.100-preview.5.24258.1 @@ -67,7 +67,7 @@ 9.0.0-preview.5.24256.1 9.0.0-preview.5.24256.1 - 8.0.0-preview.24263.1 + 8.0.0-preview.24264.1 $(MicrosoftNETCoreApp31Version) From d4637acc0bb65edf04a476096c43ec9b32c1336d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 16 May 2024 14:09:37 +0000 Subject: [PATCH 192/568] Update dependencies from https://github.com/dotnet/diagnostics build 20240515.1 (#6653) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3ee3ceefc5a..456e87ef1ab 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore da3aa27233a2cec2f6780884f71934b2f5e686ce - + https://github.com/dotnet/diagnostics - e8237fe45fc7cf6ed133a67ae29e10e4980c0533 + 6351584fc26800563312d1006fd2cca6bd9d2474 - + https://github.com/dotnet/diagnostics - e8237fe45fc7cf6ed133a67ae29e10e4980c0533 + 6351584fc26800563312d1006fd2cca6bd9d2474 https://github.com/dotnet/command-line-api @@ -46,9 +46,9 @@ https://github.com/dotnet/arcade 480401b003bfd2eb989c315da5d6b99ad13a968c - + https://github.com/dotnet/diagnostics - e8237fe45fc7cf6ed133a67ae29e10e4980c0533 + 6351584fc26800563312d1006fd2cca6bd9d2474 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index ae93592c473..873a41ec30d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24209.3 - 8.0.0-preview.24264.1 - 8.0.0-preview.24264.1 + 8.0.0-preview.24265.1 + 8.0.0-preview.24265.1 9.0.100-preview.5.24258.1 @@ -67,7 +67,7 @@ 9.0.0-preview.5.24256.1 9.0.0-preview.5.24256.1 - 8.0.0-preview.24264.1 + 8.0.0-preview.24265.1 $(MicrosoftNETCoreApp31Version) From f1476b405a86531cf08f9ce2cc7d3081da209785 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 16 May 2024 14:13:04 +0000 Subject: [PATCH 193/568] Update dependencies from https://github.com/dotnet/arcade build 20240515.1 (#6654) [feature/9.x] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- global.json | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 456e87ef1ab..455391f50df 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,29 +22,29 @@ https://github.com/dotnet/roslyn-analyzers 8dccccec1ce3bd2fb532ec77d7e092ab9d684db7 - + https://github.com/dotnet/arcade - 480401b003bfd2eb989c315da5d6b99ad13a968c + 15eea424d3b2dd25a5c0b10e8adc8aeed50129a1 - + https://github.com/dotnet/arcade - 480401b003bfd2eb989c315da5d6b99ad13a968c + 15eea424d3b2dd25a5c0b10e8adc8aeed50129a1 - + https://github.com/dotnet/arcade - 480401b003bfd2eb989c315da5d6b99ad13a968c + 15eea424d3b2dd25a5c0b10e8adc8aeed50129a1 - + https://github.com/dotnet/arcade - 480401b003bfd2eb989c315da5d6b99ad13a968c + 15eea424d3b2dd25a5c0b10e8adc8aeed50129a1 https://github.com/dotnet/installer 05ec25e1549a0653393a4f6782b4af6a0cbfbcf0 - + https://github.com/dotnet/arcade - 480401b003bfd2eb989c315da5d6b99ad13a968c + 15eea424d3b2dd25a5c0b10e8adc8aeed50129a1 https://github.com/dotnet/diagnostics diff --git a/eng/Versions.props b/eng/Versions.props index 873a41ec30d..24d16b829b6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,9 +48,9 @@ --> - 9.0.0-beta.24260.2 - 9.0.0-beta.24260.2 - 9.0.0-beta.24260.2 + 9.0.0-beta.24265.1 + 9.0.0-beta.24265.1 + 9.0.0-beta.24265.1 9.0.0-preview.5.24256.2 9.0.0-preview.5.24256.2 diff --git a/global.json b/global.json index 5792c862d0b..252379b9bc3 100644 --- a/global.json +++ b/global.json @@ -31,7 +31,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24260.2", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24260.2" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24265.1", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24265.1" } } From 24cc68055bd8da2e6ec4236f474598e559619636 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 17 May 2024 17:47:54 +0000 Subject: [PATCH 194/568] Update dependencies from https://github.com/dotnet/arcade build 20240516.1 (#6670) [feature/9.x] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- global.json | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 455391f50df..6cb0acc41db 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,29 +22,29 @@ https://github.com/dotnet/roslyn-analyzers 8dccccec1ce3bd2fb532ec77d7e092ab9d684db7 - + https://github.com/dotnet/arcade - 15eea424d3b2dd25a5c0b10e8adc8aeed50129a1 + ed14da5934ffb536cff8f41f8b5719334524cbed - + https://github.com/dotnet/arcade - 15eea424d3b2dd25a5c0b10e8adc8aeed50129a1 + ed14da5934ffb536cff8f41f8b5719334524cbed - + https://github.com/dotnet/arcade - 15eea424d3b2dd25a5c0b10e8adc8aeed50129a1 + ed14da5934ffb536cff8f41f8b5719334524cbed - + https://github.com/dotnet/arcade - 15eea424d3b2dd25a5c0b10e8adc8aeed50129a1 + ed14da5934ffb536cff8f41f8b5719334524cbed https://github.com/dotnet/installer 05ec25e1549a0653393a4f6782b4af6a0cbfbcf0 - + https://github.com/dotnet/arcade - 15eea424d3b2dd25a5c0b10e8adc8aeed50129a1 + ed14da5934ffb536cff8f41f8b5719334524cbed https://github.com/dotnet/diagnostics diff --git a/eng/Versions.props b/eng/Versions.props index 24d16b829b6..361217f85b6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,9 +48,9 @@ --> - 9.0.0-beta.24265.1 - 9.0.0-beta.24265.1 - 9.0.0-beta.24265.1 + 9.0.0-beta.24266.1 + 9.0.0-beta.24266.1 + 9.0.0-beta.24266.1 9.0.0-preview.5.24256.2 9.0.0-preview.5.24256.2 diff --git a/global.json b/global.json index 252379b9bc3..330acb71d4e 100644 --- a/global.json +++ b/global.json @@ -31,7 +31,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24265.1", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24265.1" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24266.1", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24266.1" } } From 05a711941ada6385969470a9ddd888c816cefe39 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 20 May 2024 00:07:28 +0000 Subject: [PATCH 195/568] Restore branch-specific files --- .../job/source-index-stage1.yml | 88 ++----------------- .../templates/job/source-index-stage1.yml | 88 ++----------------- 2 files changed, 10 insertions(+), 166 deletions(-) diff --git a/eng/common/templates-official/job/source-index-stage1.yml b/eng/common/templates-official/job/source-index-stage1.yml index 43ee0c202fc..6d5ead316f9 100644 --- a/eng/common/templates-official/job/source-index-stage1.yml +++ b/eng/common/templates-official/job/source-index-stage1.yml @@ -1,85 +1,7 @@ -parameters: - runAsPublic: false - sourceIndexUploadPackageVersion: 2.0.0-20240502.12 - sourceIndexProcessBinlogPackageVersion: 1.0.1-20240129.2 - 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: [] - binlogPath: artifacts/log/Debug/Build.binlog - condition: '' - dependsOn: '' - pool: '' - jobs: -- job: SourceIndexStage1 - dependsOn: ${{ parameters.dependsOn }} - condition: ${{ parameters.condition }} - variables: - - name: SourceIndexUploadPackageVersion - value: ${{ parameters.sourceIndexUploadPackageVersion }} - - name: SourceIndexProcessBinlogPackageVersion - value: ${{ parameters.sourceIndexProcessBinlogPackageVersion }} - - name: SourceIndexPackageSource - value: ${{ parameters.sourceIndexPackageSource }} - - name: BinlogPath - value: ${{ parameters.binlogPath }} - - template: /eng/common/templates/variables/pool-providers.yml - - ${{ if ne(parameters.pool, '') }}: - pool: ${{ parameters.pool }} - ${{ if eq(parameters.pool, '') }}: - pool: - ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: $(DncEngPublicBuildPool) - demands: ImageOverride -equals windows.vs2019.amd64.open - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: $(DncEngInternalBuildPool) - demands: ImageOverride -equals windows.vs2019.amd64 - - steps: - - ${{ each preStep in parameters.preSteps }}: - - ${{ preStep }} - - - task: UseDotNet@2 - displayName: Use .NET 8 SDK - inputs: - packageType: sdk - version: 8.0.x - installationPath: $(Agent.TempDirectory)/dotnet - workingDirectory: $(Agent.TempDirectory) - - - script: | - $(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version $(sourceIndexProcessBinlogPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools - $(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version $(sourceIndexUploadPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools - displayName: Download Tools - # Set working directory to temp directory so 'dotnet' doesn't try to use global.json and use the repo's sdk. - workingDirectory: $(Agent.TempDirectory) - - - script: ${{ parameters.sourceIndexBuildCommand }} - displayName: Build Repository - - - script: $(Agent.TempDirectory)/.source-index/tools/BinLogToSln -i $(BinlogPath) -r $(Build.SourcesDirectory) -n $(Build.Repository.Name) -o .source-index/stage1output - displayName: Process Binlog into indexable sln - - - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - task: AzureCLI@2 - displayName: Get stage 1 auth token - inputs: - azureSubscription: 'SourceDotNet Stage1 Publish' - addSpnToEnvironment: true - scriptType: 'ps' - scriptLocation: 'inlineScript' - inlineScript: | - echo "##vso[task.setvariable variable=ARM_CLIENT_ID]$env:servicePrincipalId" - echo "##vso[task.setvariable variable=ARM_ID_TOKEN]$env:idToken" - echo "##vso[task.setvariable variable=ARM_TENANT_ID]$env:tenantId" - - - script: | - echo "Client ID: $(ARM_CLIENT_ID)" - echo "ID Token: $(ARM_ID_TOKEN)" - echo "Tenant ID: $(ARM_TENANT_ID)" - az login --service-principal -u $(ARM_CLIENT_ID) --tenant $(ARM_TENANT_ID) --allow-no-subscriptions --federated-token $(ARM_ID_TOKEN) - displayName: "Login to Azure" +- template: /eng/common/core-templates/job/source-index-stage1.yml + parameters: + is1ESPipeline: true - - script: $(Agent.TempDirectory)/.source-index/tools/UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name) -s netsourceindexstage1 -b stage1 - displayName: Upload stage1 artifacts to source index \ No newline at end of file + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/eng/common/templates/job/source-index-stage1.yml b/eng/common/templates/job/source-index-stage1.yml index 43ee0c202fc..89f3291593c 100644 --- a/eng/common/templates/job/source-index-stage1.yml +++ b/eng/common/templates/job/source-index-stage1.yml @@ -1,85 +1,7 @@ -parameters: - runAsPublic: false - sourceIndexUploadPackageVersion: 2.0.0-20240502.12 - sourceIndexProcessBinlogPackageVersion: 1.0.1-20240129.2 - 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: [] - binlogPath: artifacts/log/Debug/Build.binlog - condition: '' - dependsOn: '' - pool: '' - jobs: -- job: SourceIndexStage1 - dependsOn: ${{ parameters.dependsOn }} - condition: ${{ parameters.condition }} - variables: - - name: SourceIndexUploadPackageVersion - value: ${{ parameters.sourceIndexUploadPackageVersion }} - - name: SourceIndexProcessBinlogPackageVersion - value: ${{ parameters.sourceIndexProcessBinlogPackageVersion }} - - name: SourceIndexPackageSource - value: ${{ parameters.sourceIndexPackageSource }} - - name: BinlogPath - value: ${{ parameters.binlogPath }} - - template: /eng/common/templates/variables/pool-providers.yml - - ${{ if ne(parameters.pool, '') }}: - pool: ${{ parameters.pool }} - ${{ if eq(parameters.pool, '') }}: - pool: - ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: $(DncEngPublicBuildPool) - demands: ImageOverride -equals windows.vs2019.amd64.open - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: $(DncEngInternalBuildPool) - demands: ImageOverride -equals windows.vs2019.amd64 - - steps: - - ${{ each preStep in parameters.preSteps }}: - - ${{ preStep }} - - - task: UseDotNet@2 - displayName: Use .NET 8 SDK - inputs: - packageType: sdk - version: 8.0.x - installationPath: $(Agent.TempDirectory)/dotnet - workingDirectory: $(Agent.TempDirectory) - - - script: | - $(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version $(sourceIndexProcessBinlogPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools - $(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version $(sourceIndexUploadPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools - displayName: Download Tools - # Set working directory to temp directory so 'dotnet' doesn't try to use global.json and use the repo's sdk. - workingDirectory: $(Agent.TempDirectory) - - - script: ${{ parameters.sourceIndexBuildCommand }} - displayName: Build Repository - - - script: $(Agent.TempDirectory)/.source-index/tools/BinLogToSln -i $(BinlogPath) -r $(Build.SourcesDirectory) -n $(Build.Repository.Name) -o .source-index/stage1output - displayName: Process Binlog into indexable sln - - - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - task: AzureCLI@2 - displayName: Get stage 1 auth token - inputs: - azureSubscription: 'SourceDotNet Stage1 Publish' - addSpnToEnvironment: true - scriptType: 'ps' - scriptLocation: 'inlineScript' - inlineScript: | - echo "##vso[task.setvariable variable=ARM_CLIENT_ID]$env:servicePrincipalId" - echo "##vso[task.setvariable variable=ARM_ID_TOKEN]$env:idToken" - echo "##vso[task.setvariable variable=ARM_TENANT_ID]$env:tenantId" - - - script: | - echo "Client ID: $(ARM_CLIENT_ID)" - echo "ID Token: $(ARM_ID_TOKEN)" - echo "Tenant ID: $(ARM_TENANT_ID)" - az login --service-principal -u $(ARM_CLIENT_ID) --tenant $(ARM_TENANT_ID) --allow-no-subscriptions --federated-token $(ARM_ID_TOKEN) - displayName: "Login to Azure" +- template: /eng/common/core-templates/job/source-index-stage1.yml + parameters: + is1ESPipeline: false - - script: $(Agent.TempDirectory)/.source-index/tools/UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name) -s netsourceindexstage1 -b stage1 - displayName: Upload stage1 artifacts to source index \ No newline at end of file + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} From e6f4faa1723e6be4b9fe511bb76737c0b84aa649 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 19 May 2024 21:45:10 -0700 Subject: [PATCH 196/568] Update dependencies from https://github.com/dotnet/diagnostics build 20240517.2 (#6677) Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe , Microsoft.FileFormats From Version 8.0.0-preview.24265.1 -> To Version 8.0.0-preview.24267.2 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6cb0acc41db..ca8dedd7de0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore da3aa27233a2cec2f6780884f71934b2f5e686ce - + https://github.com/dotnet/diagnostics - 6351584fc26800563312d1006fd2cca6bd9d2474 + 3f6ec187afd27d5f242c9275ca1b6e16c43a1b0c - + https://github.com/dotnet/diagnostics - 6351584fc26800563312d1006fd2cca6bd9d2474 + 3f6ec187afd27d5f242c9275ca1b6e16c43a1b0c https://github.com/dotnet/command-line-api @@ -46,9 +46,9 @@ https://github.com/dotnet/arcade ed14da5934ffb536cff8f41f8b5719334524cbed - + https://github.com/dotnet/diagnostics - 6351584fc26800563312d1006fd2cca6bd9d2474 + 3f6ec187afd27d5f242c9275ca1b6e16c43a1b0c https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 361217f85b6..a9884ef319a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24209.3 - 8.0.0-preview.24265.1 - 8.0.0-preview.24265.1 + 8.0.0-preview.24267.2 + 8.0.0-preview.24267.2 9.0.100-preview.5.24258.1 @@ -67,7 +67,7 @@ 9.0.0-preview.5.24256.1 9.0.0-preview.5.24256.1 - 8.0.0-preview.24265.1 + 1.0.526702 $(MicrosoftNETCoreApp31Version) From e1c6538f90dbf219ea6befcb313be3f02cd83187 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 21 May 2024 14:25:52 +0000 Subject: [PATCH 197/568] Update dependencies from https://github.com/dotnet/arcade build 20240520.3 (#6692) [feature/9.x] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- eng/common/internal/Directory.Build.props | 5 +++++ eng/common/internal/Tools.csproj | 1 - eng/common/tools.ps1 | 6 ++++-- global.json | 4 ++-- 6 files changed, 24 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ca8dedd7de0..5abfdf028c1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,29 +22,29 @@ https://github.com/dotnet/roslyn-analyzers 8dccccec1ce3bd2fb532ec77d7e092ab9d684db7 - + https://github.com/dotnet/arcade - ed14da5934ffb536cff8f41f8b5719334524cbed + 1cf3eaa1f6ada43ab988145a3f3efddb1ffa3b10 - + https://github.com/dotnet/arcade - ed14da5934ffb536cff8f41f8b5719334524cbed + 1cf3eaa1f6ada43ab988145a3f3efddb1ffa3b10 - + https://github.com/dotnet/arcade - ed14da5934ffb536cff8f41f8b5719334524cbed + 1cf3eaa1f6ada43ab988145a3f3efddb1ffa3b10 - + https://github.com/dotnet/arcade - ed14da5934ffb536cff8f41f8b5719334524cbed + 1cf3eaa1f6ada43ab988145a3f3efddb1ffa3b10 https://github.com/dotnet/installer 05ec25e1549a0653393a4f6782b4af6a0cbfbcf0 - + https://github.com/dotnet/arcade - ed14da5934ffb536cff8f41f8b5719334524cbed + 1cf3eaa1f6ada43ab988145a3f3efddb1ffa3b10 https://github.com/dotnet/diagnostics diff --git a/eng/Versions.props b/eng/Versions.props index a9884ef319a..9977964b3d2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,9 +48,9 @@ --> - 9.0.0-beta.24266.1 - 9.0.0-beta.24266.1 - 9.0.0-beta.24266.1 + 9.0.0-beta.24270.3 + 9.0.0-beta.24270.3 + 9.0.0-beta.24270.3 9.0.0-preview.5.24256.2 9.0.0-preview.5.24256.2 diff --git a/eng/common/internal/Directory.Build.props b/eng/common/internal/Directory.Build.props index a735fe9a133..f1d041c33da 100644 --- a/eng/common/internal/Directory.Build.props +++ b/eng/common/internal/Directory.Build.props @@ -1,6 +1,11 @@ + + false + false + + diff --git a/eng/common/internal/Tools.csproj b/eng/common/internal/Tools.csproj index 8fa77e5b181..e925952d566 100644 --- a/eng/common/internal/Tools.csproj +++ b/eng/common/internal/Tools.csproj @@ -3,7 +3,6 @@ net472 - false false diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 7fc78a0851b..0febe696dbd 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -254,7 +254,6 @@ function Retry($downloadBlock, $maxRetries = 5) { Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "Unable to download file in $maxRetries attempts." break } - } } @@ -424,7 +423,6 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements = InitializeVisualStudioEnvironmentVariables $vsInstallDir $vsMajorVersion } else { - if (Get-Member -InputObject $GlobalJson.tools -Name 'xcopy-msbuild') { $xcopyMSBuildVersion = $GlobalJson.tools.'xcopy-msbuild' $vsMajorVersion = $xcopyMSBuildVersion.Split('.')[0] @@ -504,6 +502,10 @@ function InitializeXCopyMSBuild([string]$packageVersion, [bool]$install) { Invoke-WebRequest "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/flat2/$packageName/$packageVersion/$packageName.$packageVersion.nupkg" -OutFile $packagePath }) + if (!(Test-Path $packagePath)) { + Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "See https://dev.azure.com/dnceng/internal/_wiki/wikis/DNCEng%20Services%20Wiki/1074/Updating-Microsoft.DotNet.Arcade.MSBuild.Xcopy-WAS-RoslynTools.MSBuild-(xcopy-msbuild)-generation?anchor=troubleshooting for help troubleshooting issues with XCopy MSBuild" + throw + } Unzip $packagePath $packageDir } diff --git a/global.json b/global.json index 330acb71d4e..5fcbc5f6209 100644 --- a/global.json +++ b/global.json @@ -31,7 +31,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24266.1", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24266.1" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24270.3", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24270.3" } } From 5115bbdeb80e66ce57be831a925524771b13b335 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 21 May 2024 14:26:52 +0000 Subject: [PATCH 198/568] Update dependencies from https://github.com/dotnet/diagnostics build 20240520.1 (#6691) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5abfdf028c1..82148b426de 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore da3aa27233a2cec2f6780884f71934b2f5e686ce - + https://github.com/dotnet/diagnostics - 3f6ec187afd27d5f242c9275ca1b6e16c43a1b0c + 35998bc24f3ce093f3cef0cc50e224f9b07847ca - + https://github.com/dotnet/diagnostics - 3f6ec187afd27d5f242c9275ca1b6e16c43a1b0c + 35998bc24f3ce093f3cef0cc50e224f9b07847ca https://github.com/dotnet/command-line-api @@ -46,9 +46,9 @@ https://github.com/dotnet/arcade 1cf3eaa1f6ada43ab988145a3f3efddb1ffa3b10 - + https://github.com/dotnet/diagnostics - 3f6ec187afd27d5f242c9275ca1b6e16c43a1b0c + 35998bc24f3ce093f3cef0cc50e224f9b07847ca https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 9977964b3d2..9aa945767e5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24209.3 - 8.0.0-preview.24267.2 - 8.0.0-preview.24267.2 + 8.0.0-preview.24270.1 + 8.0.0-preview.24270.1 9.0.100-preview.5.24258.1 @@ -67,7 +67,7 @@ 9.0.0-preview.5.24256.1 9.0.0-preview.5.24256.1 - 1.0.526702 + 1.0.527001 $(MicrosoftNETCoreApp31Version) From 8a9820d222804148a50fcfe31b873f7d443d2a3c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 22 May 2024 14:29:55 +0000 Subject: [PATCH 199/568] Update dependencies from https://github.com/dotnet/diagnostics build 20240521.1 (#6705) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 82148b426de..84f9a16bc98 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore da3aa27233a2cec2f6780884f71934b2f5e686ce - + https://github.com/dotnet/diagnostics - 35998bc24f3ce093f3cef0cc50e224f9b07847ca + 4a64bc5c0fd3abf17f5b10efbc91051c186db4d3 - + https://github.com/dotnet/diagnostics - 35998bc24f3ce093f3cef0cc50e224f9b07847ca + 4a64bc5c0fd3abf17f5b10efbc91051c186db4d3 https://github.com/dotnet/command-line-api @@ -46,9 +46,9 @@ https://github.com/dotnet/arcade 1cf3eaa1f6ada43ab988145a3f3efddb1ffa3b10 - + https://github.com/dotnet/diagnostics - 35998bc24f3ce093f3cef0cc50e224f9b07847ca + 4a64bc5c0fd3abf17f5b10efbc91051c186db4d3 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 9aa945767e5..c4b488d4414 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24209.3 - 8.0.0-preview.24270.1 - 8.0.0-preview.24270.1 + 8.0.0-preview.24271.1 + 8.0.0-preview.24271.1 9.0.100-preview.5.24258.1 @@ -67,7 +67,7 @@ 9.0.0-preview.5.24256.1 9.0.0-preview.5.24256.1 - 1.0.527001 + 1.0.527101 $(MicrosoftNETCoreApp31Version) From 8b1f0543e9fcc293fdc06531f02974744d39f605 Mon Sep 17 00:00:00 2001 From: Justin Anderson Date: Wed, 22 May 2024 10:01:36 -0700 Subject: [PATCH 200/568] Use dotnet/sdk for runtime and framework updates (#6706) --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 4 ++-- eng/helix/Helix.proj | 2 +- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 84f9a16bc98..ddd96f19947 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/aspnetcore - da3aa27233a2cec2f6780884f71934b2f5e686ce + 808be46a63a3f93e703c22d67e1759ddf7eceb1a https://github.com/dotnet/diagnostics @@ -38,10 +38,6 @@ https://github.com/dotnet/arcade 1cf3eaa1f6ada43ab988145a3f3efddb1ffa3b10 - - https://github.com/dotnet/installer - 05ec25e1549a0653393a4f6782b4af6a0cbfbcf0 - https://github.com/dotnet/arcade 1cf3eaa1f6ada43ab988145a3f3efddb1ffa3b10 @@ -50,17 +46,21 @@ https://github.com/dotnet/diagnostics 4a64bc5c0fd3abf17f5b10efbc91051c186db4d3 - + + https://github.com/dotnet/sdk + 52acdcaad568cc56ca67b33b6b2ea7fa1e489d24 + + https://github.com/dotnet/runtime - 84b33395057737db3ea342a5151feb6b90c1b6f6 + 153a94b88d77cfe133682e05191bc41914af6b21 - + https://github.com/dotnet/aspnetcore - da3aa27233a2cec2f6780884f71934b2f5e686ce + 808be46a63a3f93e703c22d67e1759ddf7eceb1a - + https://github.com/dotnet/runtime - 84b33395057737db3ea342a5151feb6b90c1b6f6 + 153a94b88d77cfe133682e05191bc41914af6b21 diff --git a/eng/Versions.props b/eng/Versions.props index c4b488d4414..f688200abd4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -59,13 +59,13 @@ 8.0.0-preview.24271.1 8.0.0-preview.24271.1 - - 9.0.100-preview.5.24258.1 9.0.0-preview.24225.1 9.0.0-preview.5.24256.1 9.0.0-preview.5.24256.1 + + 9.0.100-preview.5.24272.3 1.0.527101 diff --git a/eng/helix/Helix.proj b/eng/helix/Helix.proj index 7978975f073..7d179f34d88 100644 --- a/eng/helix/Helix.proj +++ b/eng/helix/Helix.proj @@ -162,7 +162,7 @@ BeforeTargets="AddAdditionalRuntimes"> - + sdk From aede1004043f4e60b041b19eaa9feaaad18a9dc1 Mon Sep 17 00:00:00 2001 From: Justin Anderson Date: Wed, 22 May 2024 14:07:58 -0700 Subject: [PATCH 201/568] Remove continue on error for win-arm64 tests (#6708) --- eng/pipelines/jobs/test-binaries.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/eng/pipelines/jobs/test-binaries.yml b/eng/pipelines/jobs/test-binaries.yml index 84710dc25ac..d4914cfa4a7 100644 --- a/eng/pipelines/jobs/test-binaries.yml +++ b/eng/pipelines/jobs/test-binaries.yml @@ -184,12 +184,6 @@ jobs: HelixAccessToken: $(HelixApiAccessToken) DotNetBuildsInternalContainerReadToken: $(dotnetbuilds-internal-container-read-token) - # .NET 9 Windows ARM64 dotnet test currently stalls and times out without error. Allow - # the test step to continue on error for this configuration. - # Issue: https://github.com/dotnet/dotnet-monitor/issues/6531 - ${{ if eq(parameters.targetRid, 'win-arm64') }}: - buildContinueOnError: true - postBuildSteps: - ${{ if ne(parameters.useHelix, 'true')}}: # Publish test results to Azure Pipelines From ee007f06ac2ef3219a216cf4aaba346db1a89ef5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 23 May 2024 14:39:25 +0000 Subject: [PATCH 202/568] Update dependencies from https://github.com/dotnet/sdk build 20240522.19 (#6714) [feature/9.x] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Runtime.win-x64: from 9.0.0-preview.5.24271.5 to 9.0.0-preview.6.24272.7 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 9.0.0-preview.5.24271.4 to 9.0.0-preview.5.24272.2 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0: from 9.0.0-preview.5.24271.5 to 9.0.0-preview.6.24272.7 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.SharedFramework.x64.9.0: from 9.0.0-preview.5.24271.4 to 9.0.0-preview.5.24272.2 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ddd96f19947..3d1d06b5e4e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/aspnetcore - 808be46a63a3f93e703c22d67e1759ddf7eceb1a + 49c1c68bf1ac4f1f28db5c1b33ec5b7bab35546b https://github.com/dotnet/diagnostics @@ -46,21 +46,21 @@ https://github.com/dotnet/diagnostics 4a64bc5c0fd3abf17f5b10efbc91051c186db4d3 - + https://github.com/dotnet/sdk - 52acdcaad568cc56ca67b33b6b2ea7fa1e489d24 + a134a94cfb1209e4181072719d554eb232b51317 - + https://github.com/dotnet/runtime - 153a94b88d77cfe133682e05191bc41914af6b21 + 5c06e5d01fa0ea4122e7202cefb921a779f9843a - + https://github.com/dotnet/aspnetcore - 808be46a63a3f93e703c22d67e1759ddf7eceb1a + 49c1c68bf1ac4f1f28db5c1b33ec5b7bab35546b - + https://github.com/dotnet/runtime - 153a94b88d77cfe133682e05191bc41914af6b21 + 5c06e5d01fa0ea4122e7202cefb921a779f9843a diff --git a/eng/Versions.props b/eng/Versions.props index f688200abd4..f098a485d7b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,8 +52,8 @@ 9.0.0-beta.24270.3 9.0.0-beta.24270.3 - 9.0.0-preview.5.24256.2 - 9.0.0-preview.5.24256.2 + 9.0.0-preview.6.24272.7 + 9.0.0-preview.6.24272.7 2.0.0-beta4.24209.3 @@ -62,10 +62,10 @@ 9.0.0-preview.24225.1 - 9.0.0-preview.5.24256.1 - 9.0.0-preview.5.24256.1 + 9.0.0-preview.5.24272.2 + 9.0.0-preview.5.24272.2 - 9.0.100-preview.5.24272.3 + 9.0.100-preview.5.24272.19 1.0.527101 From efc540bc714172fc51d56c7241ee2e98bb2f906d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 24 May 2024 14:11:16 +0000 Subject: [PATCH 203/568] Update dependencies from https://github.com/dotnet/sdk build 20240524.3 (#6715) [feature/9.x] Update dependencies from dotnet/sdk --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3d1d06b5e4e..b6bbcb5d098 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -46,9 +46,9 @@ https://github.com/dotnet/diagnostics 4a64bc5c0fd3abf17f5b10efbc91051c186db4d3 - + https://github.com/dotnet/sdk - a134a94cfb1209e4181072719d554eb232b51317 + b323eea873d6474bc54719b4463e1d28bb247a6a https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index f098a485d7b..3c9356f3812 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,7 +65,7 @@ 9.0.0-preview.5.24272.2 9.0.0-preview.5.24272.2 - 9.0.100-preview.5.24272.19 + 9.0.100-preview.5.24274.3 1.0.527101 From 7fcabe510729b00ca442a9e697a9d6f39470bc93 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 25 May 2024 14:07:11 +0000 Subject: [PATCH 204/568] [feature/9.x] Update dependencies from dotnet/arcade (#6712) [feature/9.x] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 ++--- eng/Versions.props | 6 +- .../job/source-index-stage1.yml | 6 +- eng/common/native/init-compiler.sh | 85 ++++++++++++------- .../templates/steps/get-delegate-sas.yml | 43 ++++++++++ global.json | 4 +- 6 files changed, 116 insertions(+), 48 deletions(-) create mode 100644 eng/common/templates/steps/get-delegate-sas.yml diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b6bbcb5d098..66217e28326 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,25 +22,25 @@ https://github.com/dotnet/roslyn-analyzers 8dccccec1ce3bd2fb532ec77d7e092ab9d684db7 - + https://github.com/dotnet/arcade - 1cf3eaa1f6ada43ab988145a3f3efddb1ffa3b10 + 2001d73c8ff942331a73300ba61fa6164805b231 - + https://github.com/dotnet/arcade - 1cf3eaa1f6ada43ab988145a3f3efddb1ffa3b10 + 2001d73c8ff942331a73300ba61fa6164805b231 - + https://github.com/dotnet/arcade - 1cf3eaa1f6ada43ab988145a3f3efddb1ffa3b10 + 2001d73c8ff942331a73300ba61fa6164805b231 - + https://github.com/dotnet/arcade - 1cf3eaa1f6ada43ab988145a3f3efddb1ffa3b10 + 2001d73c8ff942331a73300ba61fa6164805b231 - + https://github.com/dotnet/arcade - 1cf3eaa1f6ada43ab988145a3f3efddb1ffa3b10 + 2001d73c8ff942331a73300ba61fa6164805b231 https://github.com/dotnet/diagnostics diff --git a/eng/Versions.props b/eng/Versions.props index 3c9356f3812..405f99d3549 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,9 +48,9 @@ --> - 9.0.0-beta.24270.3 - 9.0.0-beta.24270.3 - 9.0.0-beta.24270.3 + 9.0.0-beta.24272.5 + 9.0.0-beta.24272.5 + 9.0.0-beta.24272.5 9.0.0-preview.6.24272.7 9.0.0-preview.6.24272.7 diff --git a/eng/common/core-templates/job/source-index-stage1.yml b/eng/common/core-templates/job/source-index-stage1.yml index f1938eec102..8328e52ab10 100644 --- a/eng/common/core-templates/job/source-index-stage1.yml +++ b/eng/common/core-templates/job/source-index-stage1.yml @@ -1,7 +1,7 @@ parameters: runAsPublic: false - sourceIndexUploadPackageVersion: 2.0.0-20240502.12 - sourceIndexProcessBinlogPackageVersion: 1.0.1-20240129.2 + sourceIndexUploadPackageVersion: 2.0.0-20240522.1 + sourceIndexProcessBinlogPackageVersion: 1.0.1-20240522.1 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: [] @@ -88,4 +88,4 @@ jobs: displayName: "Login to Azure" - script: $(Agent.TempDirectory)/.source-index/tools/UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name) -s netsourceindexstage1 -b stage1 - displayName: Upload stage1 artifacts to source index \ No newline at end of file + displayName: Upload stage1 artifacts to source index diff --git a/eng/common/native/init-compiler.sh b/eng/common/native/init-compiler.sh index ccd3a17268e..62900e12b21 100644 --- a/eng/common/native/init-compiler.sh +++ b/eng/common/native/init-compiler.sh @@ -2,7 +2,9 @@ # # This file detects the C/C++ compiler and exports it to the CC/CXX environment variables # -# NOTE: some scripts source this file and rely on stdout being empty, make sure to not output anything here! +# NOTE: some scripts source this file and rely on stdout being empty, make sure +# to not output *anything* here, unless it is an error message that fails the +# build. if [ -z "$build_arch" ] || [ -z "$compiler" ]; then echo "Usage..." @@ -58,6 +60,26 @@ check_version_exists() { echo "$desired_version" } +__baseOS="$(uname)" +set_compiler_version_from_CC() { + if [ "$__baseOS" = "Darwin" ]; then + # On Darwin, the versions from -version/-dumpversion refer to Xcode + # versions, not llvm versions, so we can't rely on them. + return + fi + + version="$("$CC" -dumpversion)" + if [ -z "$version" ]; then + echo "Error: $CC -dumpversion didn't provide a version" + exit 1 + fi + + # gcc and clang often display 3 part versions. However, gcc can show only 1 part in some environments. + IFS=. read -r majorVersion minorVersion _ < /dev/null; then - if [ "$(uname)" != "Darwin" ]; then - echo "Warning: Specific version of $compiler not found, falling back to use the one in PATH." - fi - CC="$(command -v "$compiler")" - CXX="$(command -v "$cxxCompiler")" - else - echo "No usable version of $compiler found." + if ! command -v "$compiler" > /dev/null; then + echo "Error: No usable version of $compiler found." exit 1 fi + + CC="$(command -v "$compiler" 2> /dev/null)" + CXX="$(command -v "$cxxCompiler" 2> /dev/null)" + set_compiler_version_from_CC else - if [ "$compiler" = "clang" ] && [ "$majorVersion" -lt 5 ]; then - if [ "$build_arch" = "arm" ] || [ "$build_arch" = "armel" ]; then - if command -v "$compiler" > /dev/null; then - echo "Warning: Found clang version $majorVersion which is not supported on arm/armel architectures, falling back to use clang from PATH." - CC="$(command -v "$compiler")" - CXX="$(command -v "$cxxCompiler")" - else - echo "Found clang version $majorVersion which is not supported on arm/armel architectures, and there is no clang in PATH." - exit 1 - fi + if [ "$compiler" = "clang" ] && [ "$majorVersion" -lt 5 ] && { [ "$build_arch" = "arm" ] || [ "$build_arch" = "armel" ]; }; then + # If a major version was provided explicitly, and it was too old, find a newer compiler instead + if ! command -v "$compiler" > /dev/null; then + echo "Error: Found clang version $majorVersion which is not supported on arm/armel architectures, and there is no clang in PATH." + exit 1 fi + + CC="$(command -v "$compiler" 2> /dev/null)" + CXX="$(command -v "$cxxCompiler" 2> /dev/null)" + set_compiler_version_from_CC fi fi else desired_version="$(check_version_exists "$majorVersion" "$minorVersion")" if [ "$desired_version" = "-1" ]; then - echo "Could not find specific version of $compiler: $majorVersion $minorVersion." + echo "Error: Could not find specific version of $compiler: $majorVersion $minorVersion." exit 1 fi fi if [ -z "$CC" ]; then - CC="$(command -v "$compiler$desired_version")" - CXX="$(command -v "$cxxCompiler$desired_version")" - if [ -z "$CXX" ]; then CXX="$(command -v "$cxxCompiler")"; fi + CC="$(command -v "$compiler$desired_version" 2> /dev/null)" + CXX="$(command -v "$cxxCompiler$desired_version" 2> /dev/null)" + if [ -z "$CXX" ]; then CXX="$(command -v "$cxxCompiler" 2> /dev/null)"; fi + set_compiler_version_from_CC fi else if [ ! -f "$CLR_CC" ]; then - echo "CLR_CC is set but path '$CLR_CC' does not exist" + echo "Error: CLR_CC is set but path '$CLR_CC' does not exist" exit 1 fi CC="$CLR_CC" CXX="$CLR_CXX" + set_compiler_version_from_CC fi if [ -z "$CC" ]; then - echo "Unable to find $compiler." + echo "Error: Unable to find $compiler." exit 1 fi -# Only lld version >= 9 can be considered stable. lld supports s390x starting from 18.0. -if [ "$compiler" = "clang" ] && [ -n "$majorVersion" ] && [ "$majorVersion" -ge 9 ] && ([ "$build_arch" != "s390x" ] || [ "$majorVersion" -ge 18 ]); then - if "$CC" -fuse-ld=lld -Wl,--version >/dev/null 2>&1; then - LDFLAGS="-fuse-ld=lld" +if [ "$__baseOS" != "Darwin" ]; then + # On Darwin, we always want to use the Apple linker. + + # Only lld version >= 9 can be considered stable. lld supports s390x starting from 18.0. + if [ "$compiler" = "clang" ] && [ -n "$majorVersion" ] && [ "$majorVersion" -ge 9 ] && { [ "$build_arch" != "s390x" ] || [ "$majorVersion" -ge 18 ]; }; then + if "$CC" -fuse-ld=lld -Wl,--version >/dev/null 2>&1; then + LDFLAGS="-fuse-ld=lld" + fi fi fi -SCAN_BUILD_COMMAND="$(command -v "scan-build$desired_version")" +SCAN_BUILD_COMMAND="$(command -v "scan-build$desired_version" 2> /dev/null)" export CC CXX LDFLAGS SCAN_BUILD_COMMAND diff --git a/eng/common/templates/steps/get-delegate-sas.yml b/eng/common/templates/steps/get-delegate-sas.yml new file mode 100644 index 00000000000..c0e8f91317f --- /dev/null +++ b/eng/common/templates/steps/get-delegate-sas.yml @@ -0,0 +1,43 @@ +parameters: +- name: federatedServiceConnection + type: string +- name: outputVariableName + type: string +- name: expiryInHours + type: number + default: 1 +- name: base64Encode + type: boolean + default: false +- name: storageAccount + type: string +- name: container + type: string +- name: permissions + type: string + default: 'rl' + +steps: +- task: AzureCLI@2 + displayName: 'Generate delegation SAS Token for ${{ parameters.storageAccount }}/${{ parameters.container }}' + inputs: + azureSubscription: ${{ parameters.federatedServiceConnection }} + scriptType: 'pscore' + scriptLocation: 'inlineScript' + inlineScript: | + # Calculate the expiration of the SAS token and convert to UTC + $expiry = (Get-Date).AddHours(${{ parameters.expiryInHours }}).ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ssZ") + + $sas = az storage container generate-sas --account-name ${{ parameters.storageAccount }} --name ${{ parameters.container }} --permissions ${{ parameters.permissions }} --expiry $expiry --auth-mode login --as-user -o tsv + + if ($LASTEXITCODE -ne 0) { + Write-Error "Failed to generate SAS token." + exit 1 + } + + if ('${{ parameters.base64Encode }}' -eq 'true') { + $sas = [Convert]::ToBase64String([System.Text.Encoding]::UTF8.GetBytes($sas)) + } + + Write-Host "Setting '${{ parameters.outputVariableName }}' with the access token value" + Write-Host "##vso[task.setvariable variable=${{ parameters.outputVariableName }};issecret=true]$sas" diff --git a/global.json b/global.json index 5fcbc5f6209..7d385782874 100644 --- a/global.json +++ b/global.json @@ -31,7 +31,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24270.3", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24270.3" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24272.5", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24272.5" } } From b0360147de82fdf8d3719ee78ecd74dfb5d4a71b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 25 May 2024 14:13:46 +0000 Subject: [PATCH 205/568] Update dependencies from https://github.com/dotnet/sdk build 20240524.13 (#6717) [feature/9.x] Update dependencies from dotnet/sdk --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 66217e28326..70af81bc751 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -46,9 +46,9 @@ https://github.com/dotnet/diagnostics 4a64bc5c0fd3abf17f5b10efbc91051c186db4d3 - + https://github.com/dotnet/sdk - b323eea873d6474bc54719b4463e1d28bb247a6a + 685b52ba06b3acb3658eed68a77891a28041457c https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 405f99d3549..b5d34c6da70 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,7 +65,7 @@ 9.0.0-preview.5.24272.2 9.0.0-preview.5.24272.2 - 9.0.100-preview.5.24274.3 + 9.0.100-preview.6.24274.13 1.0.527101 From c3d67ed90c93f572554b0eabf7cd64e0b30a0a0b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 25 May 2024 12:55:48 -0700 Subject: [PATCH 206/568] [feature/9.x] Update dependencies from dotnet/diagnostics (#6711) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 70af81bc751..37829338340 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore 49c1c68bf1ac4f1f28db5c1b33ec5b7bab35546b - + https://github.com/dotnet/diagnostics - 4a64bc5c0fd3abf17f5b10efbc91051c186db4d3 + 47a8d48ecc8d320682f1d22fdbbce71528d32a3b - + https://github.com/dotnet/diagnostics - 4a64bc5c0fd3abf17f5b10efbc91051c186db4d3 + 47a8d48ecc8d320682f1d22fdbbce71528d32a3b https://github.com/dotnet/command-line-api @@ -42,9 +42,9 @@ https://github.com/dotnet/arcade 2001d73c8ff942331a73300ba61fa6164805b231 - + https://github.com/dotnet/diagnostics - 4a64bc5c0fd3abf17f5b10efbc91051c186db4d3 + 47a8d48ecc8d320682f1d22fdbbce71528d32a3b https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index b5d34c6da70..8abdd4fa37a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24209.3 - 8.0.0-preview.24271.1 - 8.0.0-preview.24271.1 + 8.0.0-preview.24273.1 + 8.0.0-preview.24273.1 9.0.0-preview.24225.1 @@ -67,7 +67,7 @@ 9.0.100-preview.6.24274.13 - 1.0.527101 + 1.0.527301 $(MicrosoftNETCoreApp31Version) From d35c33a9f9afdf7c6f3049329dd5c2364199edd7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 27 May 2024 13:32:43 +0000 Subject: [PATCH 207/568] Update dependencies from https://github.com/dotnet/diagnostics build 20240524.3 (#6722) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 37829338340..8d78774ca81 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore 49c1c68bf1ac4f1f28db5c1b33ec5b7bab35546b - + https://github.com/dotnet/diagnostics - 47a8d48ecc8d320682f1d22fdbbce71528d32a3b + b50fca6e1024c29a41319df0729724dbe628dc4e - + https://github.com/dotnet/diagnostics - 47a8d48ecc8d320682f1d22fdbbce71528d32a3b + b50fca6e1024c29a41319df0729724dbe628dc4e https://github.com/dotnet/command-line-api @@ -42,9 +42,9 @@ https://github.com/dotnet/arcade 2001d73c8ff942331a73300ba61fa6164805b231 - + https://github.com/dotnet/diagnostics - 47a8d48ecc8d320682f1d22fdbbce71528d32a3b + b50fca6e1024c29a41319df0729724dbe628dc4e https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 8abdd4fa37a..9cf784d74f2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24209.3 - 8.0.0-preview.24273.1 - 8.0.0-preview.24273.1 + 8.0.0-preview.24274.3 + 8.0.0-preview.24274.3 9.0.0-preview.24225.1 @@ -67,7 +67,7 @@ 9.0.100-preview.6.24274.13 - 1.0.527301 + 1.0.527403 $(MicrosoftNETCoreApp31Version) From 5fffe1de16e28215297219733ebce640d4ef5bd3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 27 May 2024 13:55:41 +0000 Subject: [PATCH 208/568] Update dependencies from https://github.com/dotnet/sdk build 20240527.1 (#6723) [feature/9.x] Update dependencies from dotnet/sdk --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8d78774ca81..e2d634e5321 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -46,9 +46,9 @@ https://github.com/dotnet/diagnostics b50fca6e1024c29a41319df0729724dbe628dc4e - + https://github.com/dotnet/sdk - 685b52ba06b3acb3658eed68a77891a28041457c + 29b15d1fca51ca7f1d4db87c2b15e39dcaf7bb53 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 9cf784d74f2..e128773fe98 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,7 +65,7 @@ 9.0.0-preview.5.24272.2 9.0.0-preview.5.24272.2 - 9.0.100-preview.6.24274.13 + 9.0.100-preview.6.24277.1 1.0.527403 From c7770aeaef2dc5a1ee93ab1652e88eb9dc3edf31 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 28 May 2024 14:04:06 +0000 Subject: [PATCH 209/568] Update dependencies from https://github.com/dotnet/diagnostics build 20240527.1 (#6725) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e2d634e5321..5fee52f7356 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore 49c1c68bf1ac4f1f28db5c1b33ec5b7bab35546b - + https://github.com/dotnet/diagnostics - b50fca6e1024c29a41319df0729724dbe628dc4e + 7a3cfdfc6f2988f676ada70037df6b1a207ff55a - + https://github.com/dotnet/diagnostics - b50fca6e1024c29a41319df0729724dbe628dc4e + 7a3cfdfc6f2988f676ada70037df6b1a207ff55a https://github.com/dotnet/command-line-api @@ -42,9 +42,9 @@ https://github.com/dotnet/arcade 2001d73c8ff942331a73300ba61fa6164805b231 - + https://github.com/dotnet/diagnostics - b50fca6e1024c29a41319df0729724dbe628dc4e + 7a3cfdfc6f2988f676ada70037df6b1a207ff55a https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index e128773fe98..74d61d1fc19 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24209.3 - 8.0.0-preview.24274.3 - 8.0.0-preview.24274.3 + 8.0.0-preview.24277.1 + 8.0.0-preview.24277.1 9.0.0-preview.24225.1 @@ -67,7 +67,7 @@ 9.0.100-preview.6.24277.1 - 1.0.527403 + 1.0.527701 $(MicrosoftNETCoreApp31Version) From 0c649412ee05f3dd15cec1041bf6fb42d91c3550 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 28 May 2024 14:08:00 +0000 Subject: [PATCH 210/568] Update dependencies from https://github.com/dotnet/arcade build 20240524.1 (#6726) [feature/9.x] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 +++---- eng/Versions.props | 6 +-- eng/common/core-templates/job/job.yml | 52 ++++++++++--------- .../core-templates/steps/source-build.yml | 1 + eng/common/cross/tizen-fetch.sh | 2 +- eng/common/dotnet-install.sh | 2 +- eng/common/templates-official/job/job.yml | 5 +- .../steps/publish-pipeline-artifacts.yml | 4 +- eng/common/templates/job/job.yml | 2 + eng/common/tools.sh | 4 +- global.json | 6 +-- 11 files changed, 58 insertions(+), 46 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5fee52f7356..cab8885217a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,25 +22,25 @@ https://github.com/dotnet/roslyn-analyzers 8dccccec1ce3bd2fb532ec77d7e092ab9d684db7 - + https://github.com/dotnet/arcade - 2001d73c8ff942331a73300ba61fa6164805b231 + 91fdecfe881902a109205279e023037692db4c11 - + https://github.com/dotnet/arcade - 2001d73c8ff942331a73300ba61fa6164805b231 + 91fdecfe881902a109205279e023037692db4c11 - + https://github.com/dotnet/arcade - 2001d73c8ff942331a73300ba61fa6164805b231 + 91fdecfe881902a109205279e023037692db4c11 - + https://github.com/dotnet/arcade - 2001d73c8ff942331a73300ba61fa6164805b231 + 91fdecfe881902a109205279e023037692db4c11 - + https://github.com/dotnet/arcade - 2001d73c8ff942331a73300ba61fa6164805b231 + 91fdecfe881902a109205279e023037692db4c11 https://github.com/dotnet/diagnostics diff --git a/eng/Versions.props b/eng/Versions.props index 74d61d1fc19..2bb8fc9be8e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,9 +48,9 @@ --> - 9.0.0-beta.24272.5 - 9.0.0-beta.24272.5 - 9.0.0-beta.24272.5 + 9.0.0-beta.24274.1 + 9.0.0-beta.24274.1 + 9.0.0-beta.24274.1 9.0.0-preview.6.24272.7 9.0.0-preview.6.24272.7 diff --git a/eng/common/core-templates/job/job.yml b/eng/common/core-templates/job/job.yml index dc3bd560a50..7df58527978 100644 --- a/eng/common/core-templates/job/job.yml +++ b/eng/common/core-templates/job/job.yml @@ -200,29 +200,28 @@ jobs: publishArtifacts: false # Publish test results - - ${{ if and(eq(parameters.enablePublishTestResults, 'true'), eq(parameters.testResultsFormat, '')) }}: - - ${{ if eq(parameters.testResultsFormat, 'xunit') }}: - - task: PublishTestResults@2 - displayName: Publish XUnit Test Results - inputs: - testResultsFormat: 'xUnit' - testResultsFiles: '*.xml' - searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)' - testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-xunit - mergeTestResults: ${{ parameters.mergeTestResults }} - continueOnError: true - condition: always() - - ${{ if eq(parameters.testResultsFormat, 'vstest') }}: - - task: PublishTestResults@2 - displayName: Publish TRX Test Results - inputs: - testResultsFormat: 'VSTest' - testResultsFiles: '*.trx' - searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)' - testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-trx - mergeTestResults: ${{ parameters.mergeTestResults }} - continueOnError: true - condition: always() + - ${{ if or(and(eq(parameters.enablePublishTestResults, 'true'), eq(parameters.testResultsFormat, '')), eq(parameters.testResultsFormat, 'xunit')) }}: + - task: PublishTestResults@2 + displayName: Publish XUnit Test Results + inputs: + testResultsFormat: 'xUnit' + testResultsFiles: '*.xml' + searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)' + testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-xunit + mergeTestResults: ${{ parameters.mergeTestResults }} + continueOnError: true + condition: always() + - ${{ if or(and(eq(parameters.enablePublishTestResults, 'true'), eq(parameters.testResultsFormat, '')), eq(parameters.testResultsFormat, 'vstest')) }}: + - task: PublishTestResults@2 + displayName: Publish TRX Test Results + inputs: + testResultsFormat: 'VSTest' + testResultsFiles: '*.trx' + searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)' + testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-trx + mergeTestResults: ${{ parameters.mergeTestResults }} + continueOnError: true + condition: always() # gather artifacts - ${{ if ne(parameters.artifacts.publish, '') }}: @@ -246,6 +245,8 @@ jobs: SourceFolder: 'artifacts/log' Contents: '**' TargetFolder: '$(Build.ArtifactStagingDirectory)/artifacts/log' + continueOnError: true + condition: always() - ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}: - task: CopyFiles@2 @@ -254,6 +255,8 @@ jobs: SourceFolder: 'artifacts/log/$(_BuildConfig)' Contents: '**' TargetFolder: '$(Build.ArtifactStagingDirectory)/artifacts/log/$(_BuildConfig)' + continueOnError: true + condition: always() - ${{ if eq(parameters.enableBuildRetry, 'true') }}: - task: CopyFiles@2 displayName: Gather buildconfiguration for build retry @@ -261,6 +264,7 @@ jobs: SourceFolder: '$(Build.SourcesDirectory)/eng/common/BuildConfiguration' Contents: '**' TargetFolder: '$(Build.ArtifactStagingDirectory)/eng/common/BuildConfiguration' - + continueOnError: true + condition: always() - ${{ each step in parameters.artifactPublishSteps }}: - ${{ step }} diff --git a/eng/common/core-templates/steps/source-build.yml b/eng/common/core-templates/steps/source-build.yml index bdd725b496f..bea5c41875f 100644 --- a/eng/common/core-templates/steps/source-build.yml +++ b/eng/common/core-templates/steps/source-build.yml @@ -123,6 +123,7 @@ steps: artifactName: BuildLogs_SourceBuild_${{ parameters.platform.name }}_Attempt$(System.JobAttempt) continueOnError: true condition: succeededOrFailed() + sbomEnabled: false # we don't need SBOM for logs # Manually inject component detection so that we can ignore the source build upstream cache, which contains # a nupkg cache of input packages (a local feed). diff --git a/eng/common/cross/tizen-fetch.sh b/eng/common/cross/tizen-fetch.sh index c15c5066950..28936ceef3a 100644 --- a/eng/common/cross/tizen-fetch.sh +++ b/eng/common/cross/tizen-fetch.sh @@ -7,7 +7,7 @@ fi Log() { - if [ $VERBOSE -ge $1 ]; then + if [ $VERBOSE -ge 1 ]; then echo ${@:2} fi } diff --git a/eng/common/dotnet-install.sh b/eng/common/dotnet-install.sh index 7e69e3a9e24..a2fba470380 100755 --- a/eng/common/dotnet-install.sh +++ b/eng/common/dotnet-install.sh @@ -82,7 +82,7 @@ if [[ $architecture != "" ]] && [[ $architecture != $buildarch ]]; then dotnetRoot="$dotnetRoot/$architecture" fi -InstallDotNet $dotnetRoot $version "$architecture" $runtime true $runtimeSourceFeed $runtimeSourceFeedKey || { +InstallDotNet "$dotnetRoot" $version "$architecture" $runtime true $runtimeSourceFeed $runtimeSourceFeedKey || { local exit_code=$? Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "dotnet-install.sh failed (exit code '$exit_code')." >&2 ExitWithExitCode $exit_code diff --git a/eng/common/templates-official/job/job.yml b/eng/common/templates-official/job/job.yml index 4724e9aaa80..0c2928d5c79 100644 --- a/eng/common/templates-official/job/job.yml +++ b/eng/common/templates-official/job/job.yml @@ -23,6 +23,7 @@ jobs: displayName: 'Publish logs' continueOnError: true condition: always() + sbomEnabled: false # we don't need SBOM for logs - ${{ if eq(parameters.enablePublishBuildArtifacts, true) }}: - output: buildArtifacts @@ -32,13 +33,15 @@ jobs: ArtifactName: ${{ coalesce(parameters.enablePublishBuildArtifacts.artifactName, '$(Agent.Os)_$(Agent.JobName)' ) }} continueOnError: true condition: always() + sbomEnabled: false # we don't need SBOM for logs - ${{ if eq(parameters.enableBuildRetry, 'true') }}: - output: pipelineArtifact targetPath: '$(Build.ArtifactStagingDirectory)/artifacts/eng/common/BuildConfiguration' artifactName: 'BuildConfiguration' displayName: 'Publish build retry configuration' - continueOnError: true + continueOnError: true + sbomEnabled: false # we don't need SBOM for BuildConfiguration - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.enableSbom, 'true')) }}: - output: pipelineArtifact diff --git a/eng/common/templates-official/steps/publish-pipeline-artifacts.yml b/eng/common/templates-official/steps/publish-pipeline-artifacts.yml index d71eb0c7439..172f9f0fdc9 100644 --- a/eng/common/templates-official/steps/publish-pipeline-artifacts.yml +++ b/eng/common/templates-official/steps/publish-pipeline-artifacts.yml @@ -23,4 +23,6 @@ steps: ${{ if parameters.args.artifactName }}: artifactName: ${{ parameters.args.artifactName }} ${{ if parameters.args.properties }}: - properties: ${{ parameters.args.properties }} \ No newline at end of file + properties: ${{ parameters.args.properties }} + ${{ if parameters.args.sbomEnabled }}: + sbomEnabled: ${{ parameters.args.sbomEnabled }} diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index 1cf9a6d4812..5920952c5ba 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -37,6 +37,7 @@ jobs: displayName: 'Publish logs' continueOnError: true condition: always() + sbomEnabled: false # we don't need SBOM for logs - ${{ if ne(parameters.enablePublishBuildArtifacts, 'false') }}: - template: /eng/common/core-templates/steps/publish-build-artifacts.yml @@ -59,3 +60,4 @@ jobs: artifactName: 'BuildConfiguration' displayName: 'Publish build retry configuration' continueOnError: true + sbomEnabled: false # we don't need SBOM for BuildConfiguration diff --git a/eng/common/tools.sh b/eng/common/tools.sh index db64e298ff6..a4f5d1b7761 100644 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -438,7 +438,7 @@ function StopProcesses { } function MSBuild { - local args=$@ + local args=( "$@" ) if [[ "$pipelines_log" == true ]]; then InitializeBuildTool InitializeToolset @@ -473,7 +473,7 @@ function MSBuild { args+=( "-logger:$selectedPath" ) fi - MSBuild-Core ${args[@]} + MSBuild-Core "${args[@]}" } function MSBuild-Core { diff --git a/global.json b/global.json index 7d385782874..27af79aa0df 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "9.0.100-preview.3.24204.13", + "dotnet": "9.0.100-preview.4.24267.66", "runtimes": { "aspnetcore": [ "$(MicrosoftAspNetCoreApp60Version)", @@ -31,7 +31,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24272.5", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24272.5" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24274.1", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24274.1" } } From ddff8586dc8cddb318f34710a04ccf28276997a4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 28 May 2024 14:12:58 +0000 Subject: [PATCH 211/568] Update dependencies from https://github.com/dotnet/sdk build 20240527.6 (#6727) [feature/9.x] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Runtime.win-x64: from 9.0.0-preview.6.24272.7 to 9.0.0-preview.6.24277.5 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0: from 9.0.0-preview.6.24272.7 to 9.0.0-preview.6.24277.5 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cab8885217a..17f9eaa1c96 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/aspnetcore - 49c1c68bf1ac4f1f28db5c1b33ec5b7bab35546b + cf6266cccb7f112ff4a40db00704eb773a3c6833 https://github.com/dotnet/diagnostics @@ -46,17 +46,17 @@ https://github.com/dotnet/diagnostics 7a3cfdfc6f2988f676ada70037df6b1a207ff55a - + https://github.com/dotnet/sdk - 29b15d1fca51ca7f1d4db87c2b15e39dcaf7bb53 + bb53ee6f6d3dde829291b95978b6d22cadf9630d https://github.com/dotnet/runtime 5c06e5d01fa0ea4122e7202cefb921a779f9843a - + https://github.com/dotnet/aspnetcore - 49c1c68bf1ac4f1f28db5c1b33ec5b7bab35546b + cf6266cccb7f112ff4a40db00704eb773a3c6833 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 2bb8fc9be8e..a682d7afc44 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,8 +52,8 @@ 9.0.0-beta.24274.1 9.0.0-beta.24274.1 - 9.0.0-preview.6.24272.7 - 9.0.0-preview.6.24272.7 + 9.0.0-preview.6.24277.5 + 9.0.0-preview.6.24277.5 2.0.0-beta4.24209.3 @@ -65,7 +65,7 @@ 9.0.0-preview.5.24272.2 9.0.0-preview.5.24272.2 - 9.0.100-preview.6.24277.1 + 9.0.100-preview.6.24277.6 1.0.527701 From e19b7b28308c9079ffea5fc58c00afcfc0abb77c Mon Sep 17 00:00:00 2001 From: Justin Anderson Date: Tue, 28 May 2024 10:21:16 -0700 Subject: [PATCH 212/568] Use sentinel package for installable SDK version (#6728) --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++++- eng/helix/Helix.proj | 2 +- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 17f9eaa1c96..beff3c574fb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,6 +1,6 @@ - + https://github.com/dotnet/aspnetcore cf6266cccb7f112ff4a40db00704eb773a3c6833 @@ -46,19 +46,19 @@ https://github.com/dotnet/diagnostics 7a3cfdfc6f2988f676ada70037df6b1a207ff55a - - https://github.com/dotnet/sdk - bb53ee6f6d3dde829291b95978b6d22cadf9630d - - + https://github.com/dotnet/runtime 5c06e5d01fa0ea4122e7202cefb921a779f9843a - + https://github.com/dotnet/aspnetcore cf6266cccb7f112ff4a40db00704eb773a3c6833 - + + https://github.com/dotnet/sdk + bb53ee6f6d3dde829291b95978b6d22cadf9630d + + https://github.com/dotnet/runtime 5c06e5d01fa0ea4122e7202cefb921a779f9843a diff --git a/eng/Versions.props b/eng/Versions.props index a682d7afc44..032c295aded 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,7 +65,7 @@ 9.0.0-preview.5.24272.2 9.0.0-preview.5.24272.2 - 9.0.100-preview.6.24277.6 + 9.0.100-preview.6.24277.6 1.0.527701 @@ -79,6 +79,10 @@ $(MicrosoftNETCoreApp80Version) $(MicrosoftAspNetCoreAppRuntimewinx64Version) + + + $(VSRedistCommonNetCoreSdkPlaceholderx6490Version) + diff --git a/eng/helix/Helix.proj b/eng/helix/Helix.proj index 7d179f34d88..c612267881b 100644 --- a/eng/helix/Helix.proj +++ b/eng/helix/Helix.proj @@ -162,7 +162,7 @@ BeforeTargets="AddAdditionalRuntimes"> - + sdk From 1106a6633e0da1b4ecb23edd185102029fdb09cf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 29 May 2024 14:04:22 +0000 Subject: [PATCH 213/568] Update dependencies from https://github.com/dotnet/arcade build 20240528.1 (#6733) [feature/9.x] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- global.json | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index beff3c574fb..a036b1d8cf5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,25 +22,25 @@ https://github.com/dotnet/roslyn-analyzers 8dccccec1ce3bd2fb532ec77d7e092ab9d684db7 - + https://github.com/dotnet/arcade - 91fdecfe881902a109205279e023037692db4c11 + 0c4e52c37a29b75f64646220e0cc237177ce23a2 - + https://github.com/dotnet/arcade - 91fdecfe881902a109205279e023037692db4c11 + 0c4e52c37a29b75f64646220e0cc237177ce23a2 - + https://github.com/dotnet/arcade - 91fdecfe881902a109205279e023037692db4c11 + 0c4e52c37a29b75f64646220e0cc237177ce23a2 - + https://github.com/dotnet/arcade - 91fdecfe881902a109205279e023037692db4c11 + 0c4e52c37a29b75f64646220e0cc237177ce23a2 - + https://github.com/dotnet/arcade - 91fdecfe881902a109205279e023037692db4c11 + 0c4e52c37a29b75f64646220e0cc237177ce23a2 https://github.com/dotnet/diagnostics diff --git a/eng/Versions.props b/eng/Versions.props index 032c295aded..ea44f142854 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,9 +48,9 @@ --> - 9.0.0-beta.24274.1 - 9.0.0-beta.24274.1 - 9.0.0-beta.24274.1 + 9.0.0-beta.24278.1 + 9.0.0-beta.24278.1 + 9.0.0-beta.24278.1 9.0.0-preview.6.24277.5 9.0.0-preview.6.24277.5 diff --git a/global.json b/global.json index 27af79aa0df..355dbf01da1 100644 --- a/global.json +++ b/global.json @@ -31,7 +31,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24274.1", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24274.1" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24278.1", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24278.1" } } From bafee28e26dff968316f9574ef2441fdb3825aa2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 29 May 2024 14:05:21 +0000 Subject: [PATCH 214/568] Update dependencies from https://github.com/dotnet/diagnostics build 20240528.1 (#6732) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a036b1d8cf5..c49236b4e01 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore cf6266cccb7f112ff4a40db00704eb773a3c6833 - + https://github.com/dotnet/diagnostics - 7a3cfdfc6f2988f676ada70037df6b1a207ff55a + 035a6270d6e2ccf7bf2ab9ebc56f172d1d07906b - + https://github.com/dotnet/diagnostics - 7a3cfdfc6f2988f676ada70037df6b1a207ff55a + 035a6270d6e2ccf7bf2ab9ebc56f172d1d07906b https://github.com/dotnet/command-line-api @@ -42,9 +42,9 @@ https://github.com/dotnet/arcade 0c4e52c37a29b75f64646220e0cc237177ce23a2 - + https://github.com/dotnet/diagnostics - 7a3cfdfc6f2988f676ada70037df6b1a207ff55a + 035a6270d6e2ccf7bf2ab9ebc56f172d1d07906b https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index ea44f142854..b5f72fb8c20 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24209.3 - 8.0.0-preview.24277.1 - 8.0.0-preview.24277.1 + 8.0.0-preview.24278.1 + 8.0.0-preview.24278.1 9.0.0-preview.24225.1 @@ -67,7 +67,7 @@ 9.0.100-preview.6.24277.6 - 1.0.527701 + 1.0.527801 $(MicrosoftNETCoreApp31Version) From 72f2e329cbd2e92492c7526f997f19bff908ad73 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 29 May 2024 17:42:47 +0000 Subject: [PATCH 215/568] Update dependencies from https://github.com/dotnet/sdk build 20240529.1 (#6734) [feature/9.x] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Runtime.win-x64: from 9.0.0-preview.6.24277.5 to 9.0.0-preview.6.24278.9 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) - VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0: from 9.0.0-preview.6.24277.5 to 9.0.0-preview.6.24278.9 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c49236b4e01..488ce0d208f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/aspnetcore - cf6266cccb7f112ff4a40db00704eb773a3c6833 + 05744cae5f4efb681b934cd117bdd0634c0659ad https://github.com/dotnet/diagnostics @@ -50,13 +50,13 @@ https://github.com/dotnet/runtime 5c06e5d01fa0ea4122e7202cefb921a779f9843a - + https://github.com/dotnet/aspnetcore - cf6266cccb7f112ff4a40db00704eb773a3c6833 + 05744cae5f4efb681b934cd117bdd0634c0659ad - + https://github.com/dotnet/sdk - bb53ee6f6d3dde829291b95978b6d22cadf9630d + dec852d6657796190cdc6292fb9e70291b431a75 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index b5f72fb8c20..71564aef65d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,8 +52,8 @@ 9.0.0-beta.24278.1 9.0.0-beta.24278.1 - 9.0.0-preview.6.24277.5 - 9.0.0-preview.6.24277.5 + 9.0.0-preview.6.24278.9 + 9.0.0-preview.6.24278.9 2.0.0-beta4.24209.3 @@ -65,7 +65,7 @@ 9.0.0-preview.5.24272.2 9.0.0-preview.5.24272.2 - 9.0.100-preview.6.24277.6 + 9.0.100-preview.6.24279.1 1.0.527801 From a1c63f49aa09d5e174d8e639ea1fd325c1031c5f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 31 May 2024 14:51:48 -0700 Subject: [PATCH 216/568] [feature/9.x] Update dependencies from dotnet/sdk (#6750) * Update dependencies from https://github.com/dotnet/sdk build 20240530.4 VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0 From Version 9.0.100-preview.6.24279.1 -> To Version 9.0.100-preview.6.24280.4 Dependency coherency updates Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0 From Version 9.0.0-preview.6.24278.9 -> To Version 9.0.0-preview.6.24279.3 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0 * Update dependencies from https://github.com/dotnet/sdk build 20240531.4 VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0 From Version 9.0.100-preview.6.24279.1 -> To Version 9.0.100-preview.6.24281.4 Dependency coherency updates Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0 From Version 9.0.0-preview.6.24278.9 -> To Version 9.0.0-preview.6.24280.8 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0 --------- Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 488ce0d208f..8d754032252 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/aspnetcore - 05744cae5f4efb681b934cd117bdd0634c0659ad + 5f8f891f8849d21efc5306f3053397203d4b7656 https://github.com/dotnet/diagnostics @@ -50,13 +50,13 @@ https://github.com/dotnet/runtime 5c06e5d01fa0ea4122e7202cefb921a779f9843a - + https://github.com/dotnet/aspnetcore - 05744cae5f4efb681b934cd117bdd0634c0659ad + 5f8f891f8849d21efc5306f3053397203d4b7656 - + https://github.com/dotnet/sdk - dec852d6657796190cdc6292fb9e70291b431a75 + b7d72de343041d9aef31ac41348b519ecaf533de https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 71564aef65d..4eecf963f58 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,8 +52,8 @@ 9.0.0-beta.24278.1 9.0.0-beta.24278.1 - 9.0.0-preview.6.24278.9 - 9.0.0-preview.6.24278.9 + 9.0.0-preview.6.24280.8 + 9.0.0-preview.6.24280.8 2.0.0-beta4.24209.3 @@ -65,7 +65,7 @@ 9.0.0-preview.5.24272.2 9.0.0-preview.5.24272.2 - 9.0.100-preview.6.24279.1 + 9.0.100-preview.6.24281.4 1.0.527801 From 21dc8ea5c6c92ed1b4e093cb51639f5a0acc618b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 31 May 2024 14:52:05 -0700 Subject: [PATCH 217/568] [feature/9.x] Update dependencies from dotnet/arcade (#6749) * Update dependencies from https://github.com/dotnet/arcade build 20240529.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.24278.1 -> To Version 9.0.0-beta.24279.3 * Update dependencies from https://github.com/dotnet/arcade build 20240530.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.24278.1 -> To Version 9.0.0-beta.24280.3 --------- Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 20 +-- eng/Versions.props | 6 +- eng/common/SetupNugetSources.ps1 | 159 ++++++++---------- eng/common/SetupNugetSources.sh | 60 +++---- .../steps/enable-internal-sources.yml | 32 ++++ .../steps/get-delegation-sas.yml} | 3 + .../steps/get-federated-access-token.yml | 28 +++ .../core-templates/steps/source-build.yml | 13 +- .../steps/enable-internal-sources.yml | 7 + .../steps/get-delegation-sas.yml | 7 + .../steps/get-federated-access-token.yml | 7 + .../steps/enable-internal-sources.yml | 7 + .../templates/steps/get-delegation-sas.yml | 7 + .../steps/get-federated-access-token.yml | 7 + global.json | 4 +- 15 files changed, 222 insertions(+), 145 deletions(-) create mode 100644 eng/common/core-templates/steps/enable-internal-sources.yml rename eng/common/{templates/steps/get-delegate-sas.yml => core-templates/steps/get-delegation-sas.yml} (96%) create mode 100644 eng/common/core-templates/steps/get-federated-access-token.yml create mode 100644 eng/common/templates-official/steps/enable-internal-sources.yml create mode 100644 eng/common/templates-official/steps/get-delegation-sas.yml create mode 100644 eng/common/templates-official/steps/get-federated-access-token.yml create mode 100644 eng/common/templates/steps/enable-internal-sources.yml create mode 100644 eng/common/templates/steps/get-delegation-sas.yml create mode 100644 eng/common/templates/steps/get-federated-access-token.yml diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8d754032252..44ca1a6a3ad 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,25 +22,25 @@ https://github.com/dotnet/roslyn-analyzers 8dccccec1ce3bd2fb532ec77d7e092ab9d684db7 - + https://github.com/dotnet/arcade - 0c4e52c37a29b75f64646220e0cc237177ce23a2 + 9b8585c16d6775bfc669fcabb55958848e36237c - + https://github.com/dotnet/arcade - 0c4e52c37a29b75f64646220e0cc237177ce23a2 + 9b8585c16d6775bfc669fcabb55958848e36237c - + https://github.com/dotnet/arcade - 0c4e52c37a29b75f64646220e0cc237177ce23a2 + 9b8585c16d6775bfc669fcabb55958848e36237c - + https://github.com/dotnet/arcade - 0c4e52c37a29b75f64646220e0cc237177ce23a2 + 9b8585c16d6775bfc669fcabb55958848e36237c - + https://github.com/dotnet/arcade - 0c4e52c37a29b75f64646220e0cc237177ce23a2 + 9b8585c16d6775bfc669fcabb55958848e36237c https://github.com/dotnet/diagnostics diff --git a/eng/Versions.props b/eng/Versions.props index 4eecf963f58..3a460676885 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,9 +48,9 @@ --> - 9.0.0-beta.24278.1 - 9.0.0-beta.24278.1 - 9.0.0-beta.24278.1 + 9.0.0-beta.24280.3 + 9.0.0-beta.24280.3 + 9.0.0-beta.24280.3 9.0.0-preview.6.24280.8 9.0.0-preview.6.24280.8 diff --git a/eng/common/SetupNugetSources.ps1 b/eng/common/SetupNugetSources.ps1 index efa2fd72bfa..c07f6a52601 100644 --- a/eng/common/SetupNugetSources.ps1 +++ b/eng/common/SetupNugetSources.ps1 @@ -1,31 +1,32 @@ -# This file is a temporary workaround for internal builds to be able to restore from private AzDO feeds. -# This file should be removed as part of this issue: https://github.com/dotnet/arcade/issues/4080 +# This script adds internal feeds required to build commits that depend on internal package sources. For instance, +# dotnet6-internal would be added automatically if dotnet6 was found in the nuget.config file. In addition also enables +# disabled internal Maestro (darc-int*) feeds. +# +# Optionally, this script also adds a credential entry for each of the internal feeds if supplied. This credential +# is added via the standard environment variable VSS_NUGET_EXTERNAL_FEED_ENDPOINTS. See +# https://github.com/microsoft/artifacts-credprovider/tree/v1.1.1?tab=readme-ov-file#environment-variables for more details # -# What the script does is iterate over all package sources in the pointed NuGet.config and add a credential entry -# under for each Maestro managed private feed. Two additional credential -# entries are also added for the two private static internal feeds: dotnet3-internal and dotnet3-internal-transport. -# -# This script needs to be called in every job that will restore packages and which the base repo has -# private AzDO feeds in the NuGet.config. -# -# See example YAML call for this script below. Note the use of the variable `$(dn-bot-dnceng-artifact-feeds-rw)` -# from the AzureDevOps-Artifact-Feeds-Pats variable group. -# -# Any disabledPackageSources entries which start with "darc-int" will be re-enabled as part of this script executing +# See example call for this script below. # # - task: PowerShell@2 -# displayName: Setup Private Feeds Credentials +# displayName: Setup Internal Feeds # condition: eq(variables['Agent.OS'], 'Windows_NT') # inputs: # filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 -# arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token -# env: -# Token: $(dn-bot-dnceng-artifact-feeds-rw) +# arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config +# - task: NuGetAuthenticate@1 +# +# Note that the NuGetAuthenticate task should be called after SetupNugetSources. +# This ensures that: +# - Appropriate creds are set for the added internal feeds (if not supplied to the scrupt) +# - The credential provider is installed +# +# This logic is also abstracted into enable-internal-sources.yml. [CmdletBinding()] param ( [Parameter(Mandatory = $true)][string]$ConfigFile, - [Parameter(Mandatory = $true)][string]$Password + [string]$Password ) $ErrorActionPreference = "Stop" @@ -34,12 +35,23 @@ Set-StrictMode -Version 2.0 . $PSScriptRoot\tools.ps1 +$feedEndpoints = $null + +# If a credential is provided, ensure that we don't overwrite the current set of +# credentials that may have been provided by a previous call to the credential provider. +if ($Password -and $null -ne $env:VSS_NUGET_EXTERNAL_FEED_ENDPOINTS) { + $feedEndpoints = $env:VSS_NUGET_EXTERNAL_FEED_ENDPOINTS | ConvertFrom-Json +} elseif ($Password) { + $feedEndpoints = @{ endpointCredentials = @() } +} + # Add source entry to PackageSources -function AddPackageSource($sources, $SourceName, $SourceEndPoint, $creds, $Username, $pwd) { +function AddPackageSource($sources, $SourceName, $SourceEndPoint, $pwd) { $packageSource = $sources.SelectSingleNode("add[@key='$SourceName']") - if ($packageSource -eq $null) + if ($null -eq $packageSource) { + Write-Host "`tAdding package source" $SourceName $packageSource = $doc.CreateElement("add") $packageSource.SetAttribute("key", $SourceName) $packageSource.SetAttribute("value", $SourceEndPoint) @@ -48,58 +60,34 @@ function AddPackageSource($sources, $SourceName, $SourceEndPoint, $creds, $Usern else { Write-Host "Package source $SourceName already present." } - AddCredential -Creds $creds -Source $SourceName -Username $Username -pwd $pwd -} - -# Add a credential node for the specified source -function AddCredential($creds, $source, $username, $pwd) { - # Looks for credential configuration for the given SourceName. Create it if none is found. - $sourceElement = $creds.SelectSingleNode($Source) - if ($sourceElement -eq $null) - { - $sourceElement = $doc.CreateElement($Source) - $creds.AppendChild($sourceElement) | Out-Null - } - # Add the node to the credential if none is found. - $usernameElement = $sourceElement.SelectSingleNode("add[@key='Username']") - if ($usernameElement -eq $null) - { - $usernameElement = $doc.CreateElement("add") - $usernameElement.SetAttribute("key", "Username") - $sourceElement.AppendChild($usernameElement) | Out-Null + if ($pwd) { + $feedEndpoints.endpointCredentials = AddCredential -endpointCredentials $feedEndpoints.endpointCredentials -source $SourceEndPoint -pwd $pwd } - $usernameElement.SetAttribute("value", $Username) +} - # Add the to the credential if none is found. - # Add it as a clear text because there is no support for encrypted ones in non-windows .Net SDKs. - # -> https://github.com/NuGet/Home/issues/5526 - $passwordElement = $sourceElement.SelectSingleNode("add[@key='ClearTextPassword']") - if ($passwordElement -eq $null) - { - $passwordElement = $doc.CreateElement("add") - $passwordElement.SetAttribute("key", "ClearTextPassword") - $sourceElement.AppendChild($passwordElement) | Out-Null +# Add a new feed endpoint credential +function AddCredential([array]$endpointCredentials, $source, $pwd) { + $endpointCredentials += @{ + endpoint = $source; + password = $pwd } - - $passwordElement.SetAttribute("value", $pwd) + return $endpointCredentials } -function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Username, $pwd) { - $maestroPrivateSources = $Sources.SelectNodes("add[contains(@key,'darc-int')]") +function InsertMaestroInternalFeedCredentials($Sources, $pwd) { + $maestroInternalSources = $Sources.SelectNodes("add[contains(@key,'darc-int')]") - Write-Host "Inserting credentials for $($maestroPrivateSources.Count) Maestro's private feeds." - - ForEach ($PackageSource in $maestroPrivateSources) { - Write-Host "`tInserting credential for Maestro's feed:" $PackageSource.Key - AddCredential -Creds $creds -Source $PackageSource.Key -Username $Username -pwd $pwd + ForEach ($PackageSource in $maestroInternalSources) { + Write-Host "`tAdding credential for Maestro's feed:" $PackageSource.Key + $feedEndpoints.endpointCredentials = AddCredential -endpointCredentials $feedEndpoints.endpointCredentials -source $PackageSource.value -pwd $pwd } } -function EnablePrivatePackageSources($DisabledPackageSources) { - $maestroPrivateSources = $DisabledPackageSources.SelectNodes("add[contains(@key,'darc-int')]") - ForEach ($DisabledPackageSource in $maestroPrivateSources) { - Write-Host "`tEnsuring private source '$($DisabledPackageSource.key)' is enabled by deleting it from disabledPackageSource" +function EnableInternalPackageSources($DisabledPackageSources) { + $maestroInternalSources = $DisabledPackageSources.SelectNodes("add[contains(@key,'darc-int')]") + ForEach ($DisabledPackageSource in $maestroInternalSources) { + Write-Host "`tEnsuring internal source '$($DisabledPackageSource.key)' is enabled by deleting it from disabledPackageSource" # Due to https://github.com/NuGet/Home/issues/10291, we must actually remove the disabled entries $DisabledPackageSources.RemoveChild($DisabledPackageSource) } @@ -110,11 +98,6 @@ if (!(Test-Path $ConfigFile -PathType Leaf)) { ExitWithExitCode 1 } -if (!$Password) { - Write-PipelineTelemetryError -Category 'Build' -Message 'Eng/common/SetupNugetSources.ps1 returned a non-zero exit code. Please supply a valid PAT' - ExitWithExitCode 1 -} - # Load NuGet.config $doc = New-Object System.Xml.XmlDocument $filename = (Get-Item $ConfigFile).FullName @@ -122,35 +105,27 @@ $doc.Load($filename) # Get reference to or create one if none exist already $sources = $doc.DocumentElement.SelectSingleNode("packageSources") -if ($sources -eq $null) { +if ($null -eq $sources) { $sources = $doc.CreateElement("packageSources") $doc.DocumentElement.AppendChild($sources) | Out-Null } -# Looks for a node. Create it if none is found. -$creds = $doc.DocumentElement.SelectSingleNode("packageSourceCredentials") -if ($creds -eq $null) { - $creds = $doc.CreateElement("packageSourceCredentials") - $doc.DocumentElement.AppendChild($creds) | Out-Null -} - # Check for disabledPackageSources; we'll enable any darc-int ones we find there $disabledSources = $doc.DocumentElement.SelectSingleNode("disabledPackageSources") -if ($disabledSources -ne $null) { +if ($null -ne $disabledSources) { Write-Host "Checking for any darc-int disabled package sources in the disabledPackageSources node" - EnablePrivatePackageSources -DisabledPackageSources $disabledSources + EnableInternalPackageSources -DisabledPackageSources $disabledSources } -$userName = "dn-bot" - -# Insert credential nodes for Maestro's private feeds -InsertMaestroPrivateFeedCredentials -Sources $sources -Creds $creds -Username $userName -pwd $Password +if ($Password) { + InsertMaestroInternalFeedCredentials -Sources $sources -pwd $Password +} # 3.1 uses a different feed url format so it's handled differently here $dotnet31Source = $sources.SelectSingleNode("add[@key='dotnet3.1']") -if ($dotnet31Source -ne $null) { - AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v2" -Creds $creds -Username $userName -pwd $Password - AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2" -Creds $creds -Username $userName -pwd $Password +if ($null -ne $dotnet31Source) { + AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v3/index.json" -pwd $Password + AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v3/index.json" -pwd $Password } $dotnetVersions = @('5','6','7','8') @@ -158,10 +133,18 @@ $dotnetVersions = @('5','6','7','8') foreach ($dotnetVersion in $dotnetVersions) { $feedPrefix = "dotnet" + $dotnetVersion; $dotnetSource = $sources.SelectSingleNode("add[@key='$feedPrefix']") - if ($dotnetSource -ne $null) { - AddPackageSource -Sources $sources -SourceName "$feedPrefix-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal/nuget/v2" -Creds $creds -Username $userName -pwd $Password - AddPackageSource -Sources $sources -SourceName "$feedPrefix-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal-transport/nuget/v2" -Creds $creds -Username $userName -pwd $Password + if ($dotnetSource) { + AddPackageSource -Sources $sources -SourceName "$feedPrefix-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedprefix-internal/nuget/v3/index.json" -pwd $Password + AddPackageSource -Sources $sources -SourceName "$feedPrefix-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal-transport/nuget/v3/index.json" -pwd $Password } } -$doc.Save($filename) \ No newline at end of file +$doc.Save($filename) + +# If any credentials were added or altered, update the VSS_NUGET_EXTERNAL_FEED_ENDPOINTS environment variable +if ($null -ne $feedEndpoints) { + # ci is set to true so vso logging commands will be used. + $ci = $true + Write-PipelineSetVariable -Name 'VSS_NUGET_EXTERNAL_FEED_ENDPOINTS' -Value $($feedEndpoints | ConvertTo-Json) -IsMultiJobVariable $false + Write-PipelineSetVariable -Name 'NUGET_CREDENTIALPROVIDER_SESSIONTOKENCACHE_ENABLED' -Value "False" -IsMultiJobVariable $false +} \ No newline at end of file diff --git a/eng/common/SetupNugetSources.sh b/eng/common/SetupNugetSources.sh index d387c7eac95..16c1e29ea3b 100644 --- a/eng/common/SetupNugetSources.sh +++ b/eng/common/SetupNugetSources.sh @@ -1,28 +1,27 @@ #!/usr/bin/env bash -# This file is a temporary workaround for internal builds to be able to restore from private AzDO feeds. -# This file should be removed as part of this issue: https://github.com/dotnet/arcade/issues/4080 +# This script adds internal feeds required to build commits that depend on intenral package sources. For instance, +# dotnet6-internal would be added automatically if dotnet6 was found in the nuget.config file. In addition also enables +# disabled internal Maestro (darc-int*) feeds. +# +# Optionally, this script also adds a credential entry for each of the internal feeds if supplied. # -# What the script does is iterate over all package sources in the pointed NuGet.config and add a credential entry -# under for each Maestro's managed private feed. Two additional credential -# entries are also added for the two private static internal feeds: dotnet3-internal and dotnet3-internal-transport. -# -# This script needs to be called in every job that will restore packages and which the base repo has -# private AzDO feeds in the NuGet.config. -# -# See example YAML call for this script below. Note the use of the variable `$(dn-bot-dnceng-artifact-feeds-rw)` -# from the AzureDevOps-Artifact-Feeds-Pats variable group. -# -# Any disabledPackageSources entries which start with "darc-int" will be re-enabled as part of this script executing. +# See example call for this script below. # # - task: Bash@3 -# displayName: Setup Private Feeds Credentials +# displayName: Setup Internal Feeds # inputs: # filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh -# arguments: $(Build.SourcesDirectory)/NuGet.config $Token +# arguments: $(Build.SourcesDirectory)/NuGet.config # condition: ne(variables['Agent.OS'], 'Windows_NT') -# env: -# Token: $(dn-bot-dnceng-artifact-feeds-rw) +# - task: NuGetAuthenticate@1 +# +# Note that the NuGetAuthenticate task should be called after SetupNugetSources. +# This ensures that: +# - Appropriate creds are set for the added internal feeds (if not supplied to the scrupt) +# - The credential provider is installed. +# +# This logic is also abstracted into enable-internal-sources.yml. ConfigFile=$1 CredToken=$2 @@ -48,11 +47,6 @@ if [ ! -f "$ConfigFile" ]; then ExitWithExitCode 1 fi -if [ -z "$CredToken" ]; then - Write-PipelineTelemetryError -category 'Build' "Error: Eng/common/SetupNugetSources.sh returned a non-zero exit code. Please supply a valid PAT" - ExitWithExitCode 1 -fi - if [[ `uname -s` == "Darwin" ]]; then NL=$'\\\n' TB='' @@ -140,18 +134,20 @@ PackageSources+="$IFS" PackageSources+=$(grep -oh '"darc-int-[^"]*"' $ConfigFile | tr -d '"') IFS=$PrevIFS -for FeedName in ${PackageSources[@]} ; do - # Check if there is no existing credential for this FeedName - grep -i "<$FeedName>" $ConfigFile - if [ "$?" != "0" ]; then - echo "Adding credentials for $FeedName." +if [ "$CredToken" ]; then + for FeedName in ${PackageSources[@]} ; do + # Check if there is no existing credential for this FeedName + grep -i "<$FeedName>" $ConfigFile + if [ "$?" != "0" ]; then + echo "Adding credentials for $FeedName." - PackageSourceCredentialsNodeFooter="" - NewCredential="${TB}${TB}<$FeedName>${NL}${NL}${NL}" + PackageSourceCredentialsNodeFooter="" + NewCredential="${TB}${TB}<$FeedName>${NL}${NL}${NL}" - sed -i.bak "s|$PackageSourceCredentialsNodeFooter|$NewCredential${NL}$PackageSourceCredentialsNodeFooter|" $ConfigFile - fi -done + sed -i.bak "s|$PackageSourceCredentialsNodeFooter|$NewCredential${NL}$PackageSourceCredentialsNodeFooter|" $ConfigFile + fi + done +fi # Re-enable any entries in disabledPackageSources where the feed name contains darc-int grep -i "" $ConfigFile diff --git a/eng/common/core-templates/steps/enable-internal-sources.yml b/eng/common/core-templates/steps/enable-internal-sources.yml new file mode 100644 index 00000000000..705356c902c --- /dev/null +++ b/eng/common/core-templates/steps/enable-internal-sources.yml @@ -0,0 +1,32 @@ +parameters: +# This is the Azure federated service connection that we log into to get an access token. +- name: nugetFederatedServiceConnection + type: string + default: 'dnceng-artifacts-feeds-read' + +steps: +- ${{ if ne(variables['System.TeamProject'], 'public') }}: + # If running on dnceng (internal project), just use the default behavior for NuGetAuthenticate. + # If running on DevDiv, NuGetAuthenticate is not really an option. It's scoped to a single feed, and we have many feeds that + # may be added. Instead, we'll use the traditional approach (add cred to nuget.config), but use an account token. + - ${{ if eq(variables['System.TeamProject'], 'internal') }}: + - task: PowerShell@2 + displayName: Setup Internal Feeds + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 + arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config + - task: NuGetAuthenticate@1 + - ${{ else }}: + - template: /eng/common/templates/steps/get-federated-access-token.yml + parameters: + federatedServiceConnection: ${{ parameters.nugetFederatedServiceConnection }} + outputVariableName: 'dnceng-artifacts-feeds-read-access-token' + - task: PowerShell@2 + displayName: Setup Internal Feeds + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 + arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $(dnceng-artifacts-feeds-read-access-token) + # This is required in certain scenarios to install the ADO credential provider. + # It installed by default in some msbuild invocations (e.g. VS msbuild), but needs to be installed for others + # (e.g. dotnet msbuild). + - task: NuGetAuthenticate@1 diff --git a/eng/common/templates/steps/get-delegate-sas.yml b/eng/common/core-templates/steps/get-delegation-sas.yml similarity index 96% rename from eng/common/templates/steps/get-delegate-sas.yml rename to eng/common/core-templates/steps/get-delegation-sas.yml index c0e8f91317f..d2901470a7f 100644 --- a/eng/common/templates/steps/get-delegate-sas.yml +++ b/eng/common/core-templates/steps/get-delegation-sas.yml @@ -16,6 +16,9 @@ parameters: - name: permissions type: string default: 'rl' +- name: is1ESPipeline + type: boolean + default: false steps: - task: AzureCLI@2 diff --git a/eng/common/core-templates/steps/get-federated-access-token.yml b/eng/common/core-templates/steps/get-federated-access-token.yml new file mode 100644 index 00000000000..c8c49cc0e8f --- /dev/null +++ b/eng/common/core-templates/steps/get-federated-access-token.yml @@ -0,0 +1,28 @@ +parameters: +- name: federatedServiceConnection + type: string +- name: outputVariableName + type: string +# Resource to get a token for. Common values include: +# - '499b84ac-1321-427f-aa17-267ca6975798' for Azure DevOps +# - 'https://storage.azure.com/' for storage +# Defaults to Azure DevOps +- name: resource + type: string + default: '499b84ac-1321-427f-aa17-267ca6975798' + +steps: +- task: AzureCLI@2 + displayName: 'Getting federated access token for feeds' + inputs: + azureSubscription: ${{ parameters.federatedServiceConnection }} + scriptType: 'pscore' + scriptLocation: 'inlineScript' + inlineScript: | + $accessToken = az account get-access-token --query accessToken --resource ${{ parameters.resource }} --output tsv + if ($LASTEXITCODE -ne 0) { + Write-Error "Failed to get access token for resource '${{ parameters.resource }}'" + exit 1 + } + Write-Host "Setting '${{ parameters.outputVariableName }}' with the access token value" + Write-Host "##vso[task.setvariable variable=${{ parameters.outputVariableName }};issecret=true]$accessToken" \ No newline at end of file diff --git a/eng/common/core-templates/steps/source-build.yml b/eng/common/core-templates/steps/source-build.yml index bea5c41875f..24661a63266 100644 --- a/eng/common/core-templates/steps/source-build.yml +++ b/eng/common/core-templates/steps/source-build.yml @@ -14,23 +14,16 @@ parameters: is1ESPipeline: false steps: +- template: /eng/common/core-templates/steps/enable-internal-sources.yml # Build. Keep it self-contained for simple reusability. (No source-build-specific job variables.) - script: | set -x df -h - # If building on the internal project, the artifact feeds variable may be available (usually only if needed) - # In that case, call the feed setup script to add internal feeds corresponding to public ones. - # In addition, add an msbuild argument to copy the WIP from the repo to the target build location. - # This is because SetupNuGetSources.sh will alter the current NuGet.config file, and we need to preserve those - # changes. + # If file changes are detected, set CopyWipIntoInnerSourceBuildRepo to copy the WIP changes into the inner source build repo. internalRestoreArgs= - if [ '$(dn-bot-dnceng-artifact-feeds-rw)' != '$''(dn-bot-dnceng-artifact-feeds-rw)' ]; then - # Temporarily work around https://github.com/dotnet/arcade/issues/7709 - chmod +x $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh - $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh $(Build.SourcesDirectory)/NuGet.config $(dn-bot-dnceng-artifact-feeds-rw) + if ! git diff --quiet; then internalRestoreArgs='/p:CopyWipIntoInnerSourceBuildRepo=true' - # The 'Copy WIP' feature of source build uses git stash to apply changes from the original repo. # This only works if there is a username/email configured, which won't be the case in most CI runs. git config --get user.email diff --git a/eng/common/templates-official/steps/enable-internal-sources.yml b/eng/common/templates-official/steps/enable-internal-sources.yml new file mode 100644 index 00000000000..e6d57182284 --- /dev/null +++ b/eng/common/templates-official/steps/enable-internal-sources.yml @@ -0,0 +1,7 @@ +steps: +- template: /eng/common/core-templates/steps/enable-internal-sources.yml + parameters: + is1ESPipeline: true + + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} \ No newline at end of file diff --git a/eng/common/templates-official/steps/get-delegation-sas.yml b/eng/common/templates-official/steps/get-delegation-sas.yml new file mode 100644 index 00000000000..c5a9c1f8275 --- /dev/null +++ b/eng/common/templates-official/steps/get-delegation-sas.yml @@ -0,0 +1,7 @@ +steps: +- template: /eng/common/core-templates/steps/get-delegation-sas.yml + parameters: + is1ESPipeline: true + + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/eng/common/templates-official/steps/get-federated-access-token.yml b/eng/common/templates-official/steps/get-federated-access-token.yml new file mode 100644 index 00000000000..c8dcf6b8139 --- /dev/null +++ b/eng/common/templates-official/steps/get-federated-access-token.yml @@ -0,0 +1,7 @@ +steps: +- template: /eng/common/core-templates/steps/get-federated-access-token.yml + parameters: + is1ESPipeline: true + + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} \ No newline at end of file diff --git a/eng/common/templates/steps/enable-internal-sources.yml b/eng/common/templates/steps/enable-internal-sources.yml new file mode 100644 index 00000000000..5f87e9abb8a --- /dev/null +++ b/eng/common/templates/steps/enable-internal-sources.yml @@ -0,0 +1,7 @@ +steps: +- template: /eng/common/core-templates/steps/enable-internal-sources.yml + parameters: + is1ESPipeline: false + + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} \ No newline at end of file diff --git a/eng/common/templates/steps/get-delegation-sas.yml b/eng/common/templates/steps/get-delegation-sas.yml new file mode 100644 index 00000000000..83760c9798e --- /dev/null +++ b/eng/common/templates/steps/get-delegation-sas.yml @@ -0,0 +1,7 @@ +steps: +- template: /eng/common/core-templates/steps/get-delegation-sas.yml + parameters: + is1ESPipeline: false + + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/eng/common/templates/steps/get-federated-access-token.yml b/eng/common/templates/steps/get-federated-access-token.yml new file mode 100644 index 00000000000..31e151d9d9e --- /dev/null +++ b/eng/common/templates/steps/get-federated-access-token.yml @@ -0,0 +1,7 @@ +steps: +- template: /eng/common/core-templates/steps/get-federated-access-token.yml + parameters: + is1ESPipeline: false + + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} \ No newline at end of file diff --git a/global.json b/global.json index 355dbf01da1..f45b9db94de 100644 --- a/global.json +++ b/global.json @@ -31,7 +31,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24278.1", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24278.1" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24280.3", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24280.3" } } From 1dfca950cdbb1a43a0603c8cbd1e986514911fe9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 31 May 2024 14:52:20 -0700 Subject: [PATCH 218/568] [feature/9.x] Update dependencies from dotnet/diagnostics (#6748) * Update dependencies from https://github.com/dotnet/diagnostics build 20240529.1 Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe , Microsoft.FileFormats From Version 8.0.0-preview.24278.1 -> To Version 8.0.0-preview.24279.1 * Update dependencies from https://github.com/dotnet/diagnostics build 20240530.1 Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe , Microsoft.FileFormats From Version 8.0.0-preview.24278.1 -> To Version 8.0.0-preview.24280.1 --------- Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 44ca1a6a3ad..5d5bb87a0c5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore 5f8f891f8849d21efc5306f3053397203d4b7656 - + https://github.com/dotnet/diagnostics - 035a6270d6e2ccf7bf2ab9ebc56f172d1d07906b + 037da44ecec51c8c4dd92fa3b2a6c441fcbb0830 - + https://github.com/dotnet/diagnostics - 035a6270d6e2ccf7bf2ab9ebc56f172d1d07906b + 037da44ecec51c8c4dd92fa3b2a6c441fcbb0830 https://github.com/dotnet/command-line-api @@ -42,9 +42,9 @@ https://github.com/dotnet/arcade 9b8585c16d6775bfc669fcabb55958848e36237c - + https://github.com/dotnet/diagnostics - 035a6270d6e2ccf7bf2ab9ebc56f172d1d07906b + 037da44ecec51c8c4dd92fa3b2a6c441fcbb0830 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 3a460676885..69df9e2878a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24209.3 - 8.0.0-preview.24278.1 - 8.0.0-preview.24278.1 + 8.0.0-preview.24280.1 + 8.0.0-preview.24280.1 9.0.0-preview.24225.1 @@ -67,7 +67,7 @@ 9.0.100-preview.6.24281.4 - 1.0.527801 + 1.0.528001 $(MicrosoftNETCoreApp31Version) From 537ac14a4d89e61348104cf42c03048f53e5bb78 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 1 Jun 2024 13:50:10 +0000 Subject: [PATCH 219/568] Update dependencies from https://github.com/dotnet/diagnostics build 20240531.1 (#6756) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5d5bb87a0c5..d4194acaa0a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore 5f8f891f8849d21efc5306f3053397203d4b7656 - + https://github.com/dotnet/diagnostics - 037da44ecec51c8c4dd92fa3b2a6c441fcbb0830 + 481674f73f11e8096f48820ae133d98c88d64a14 - + https://github.com/dotnet/diagnostics - 037da44ecec51c8c4dd92fa3b2a6c441fcbb0830 + 481674f73f11e8096f48820ae133d98c88d64a14 https://github.com/dotnet/command-line-api @@ -42,9 +42,9 @@ https://github.com/dotnet/arcade 9b8585c16d6775bfc669fcabb55958848e36237c - + https://github.com/dotnet/diagnostics - 037da44ecec51c8c4dd92fa3b2a6c441fcbb0830 + 481674f73f11e8096f48820ae133d98c88d64a14 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 69df9e2878a..f8b00cfcd66 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24209.3 - 8.0.0-preview.24280.1 - 8.0.0-preview.24280.1 + 8.0.0-preview.24281.1 + 8.0.0-preview.24281.1 9.0.0-preview.24225.1 @@ -67,7 +67,7 @@ 9.0.100-preview.6.24281.4 - 1.0.528001 + 1.0.528101 $(MicrosoftNETCoreApp31Version) From 24bd27e10152da642364b8949134fac035bbe3de Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 1 Jun 2024 14:10:34 +0000 Subject: [PATCH 220/568] Update dependencies from https://github.com/dotnet/arcade build 20240531.1 (#6757) [feature/9.x] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 ++++++------ eng/Versions.props | 6 ++-- .../core-templates/job/source-build.yml | 13 ++++++++ .../core-templates/jobs/source-build.yml | 8 +++++ .../steps/enable-internal-runtimes.yml | 32 +++++++++++++++++++ .../steps/enable-internal-sources.yml | 3 ++ .../core-templates/steps/source-build.yml | 1 - eng/common/cross/armv6/sources.list.bookworm | 2 ++ eng/common/cross/build-rootfs.sh | 7 ++++ .../steps/enable-internal-runtimes.yml | 9 ++++++ .../steps/enable-internal-runtimes.yml | 10 ++++++ global.json | 4 +-- 12 files changed, 99 insertions(+), 16 deletions(-) create mode 100644 eng/common/core-templates/steps/enable-internal-runtimes.yml create mode 100644 eng/common/cross/armv6/sources.list.bookworm create mode 100644 eng/common/templates-official/steps/enable-internal-runtimes.yml create mode 100644 eng/common/templates/steps/enable-internal-runtimes.yml diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d4194acaa0a..99ed7d5cdfa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,25 +22,25 @@ https://github.com/dotnet/roslyn-analyzers 8dccccec1ce3bd2fb532ec77d7e092ab9d684db7 - + https://github.com/dotnet/arcade - 9b8585c16d6775bfc669fcabb55958848e36237c + e6b3f32f9855dccbe2447471c8f729b66f17d242 - + https://github.com/dotnet/arcade - 9b8585c16d6775bfc669fcabb55958848e36237c + e6b3f32f9855dccbe2447471c8f729b66f17d242 - + https://github.com/dotnet/arcade - 9b8585c16d6775bfc669fcabb55958848e36237c + e6b3f32f9855dccbe2447471c8f729b66f17d242 - + https://github.com/dotnet/arcade - 9b8585c16d6775bfc669fcabb55958848e36237c + e6b3f32f9855dccbe2447471c8f729b66f17d242 - + https://github.com/dotnet/arcade - 9b8585c16d6775bfc669fcabb55958848e36237c + e6b3f32f9855dccbe2447471c8f729b66f17d242 https://github.com/dotnet/diagnostics diff --git a/eng/Versions.props b/eng/Versions.props index f8b00cfcd66..572cb72eed1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,9 +48,9 @@ --> - 9.0.0-beta.24280.3 - 9.0.0-beta.24280.3 - 9.0.0-beta.24280.3 + 9.0.0-beta.24281.1 + 9.0.0-beta.24281.1 + 9.0.0-beta.24281.1 9.0.0-preview.6.24280.8 9.0.0-preview.6.24280.8 diff --git a/eng/common/core-templates/job/source-build.yml b/eng/common/core-templates/job/source-build.yml index c0ce4b3c861..c4713c8b6ed 100644 --- a/eng/common/core-templates/job/source-build.yml +++ b/eng/common/core-templates/job/source-build.yml @@ -33,6 +33,12 @@ parameters: is1ESPipeline: '' + # If set to true and running on a non-public project, + # Internal nuget and blob storage locations will be enabled. + # This is not enabled by default because many repositories do not need internal sources + # and do not need to have the required service connections approved in the pipeline. + enableInternalSources: false + jobs: - job: ${{ parameters.jobNamePrefix }}_${{ parameters.platform.name }} displayName: Source-Build (${{ parameters.platform.name }}) @@ -74,6 +80,13 @@ jobs: - ${{ if eq(parameters.is1ESPipeline, '') }}: - 'Illegal entry point, is1ESPipeline is not defined. Repository yaml should not directly reference templates in core-templates folder.': error + - ${{ if eq(parameters.enableInternalSources, true) }}: + - template: /eng/common/core-templates/steps/enable-internal-sources.yml + parameters: + is1ESPipeline: ${{ parameters.is1ESPipeline }} + - template: /eng/common/core-templates/steps/enable-internal-runtimes.yml + parameters: + is1ESPipeline: ${{ parameters.is1ESPipeline }} - template: /eng/common/core-templates/steps/source-build.yml parameters: is1ESPipeline: ${{ parameters.is1ESPipeline }} diff --git a/eng/common/core-templates/jobs/source-build.yml b/eng/common/core-templates/jobs/source-build.yml index d8e5d008522..a10ccfbee6d 100644 --- a/eng/common/core-templates/jobs/source-build.yml +++ b/eng/common/core-templates/jobs/source-build.yml @@ -23,6 +23,12 @@ parameters: is1ESPipeline: '' + # If set to true and running on a non-public project, + # Internal nuget and blob storage locations will be enabled. + # This is not enabled by default because many repositories do not need internal sources + # and do not need to have the required service connections approved in the pipeline. + enableInternalSources: false + jobs: - ${{ if ne(parameters.allCompletedJobId, '') }}: @@ -41,6 +47,7 @@ jobs: is1ESPipeline: ${{ parameters.is1ESPipeline }} jobNamePrefix: ${{ parameters.jobNamePrefix }} platform: ${{ platform }} + enableInternalSources: ${{ parameters.enableInternalSources }} - ${{ if eq(length(parameters.platforms), 0) }}: - template: /eng/common/core-templates/job/source-build.yml @@ -48,3 +55,4 @@ jobs: is1ESPipeline: ${{ parameters.is1ESPipeline }} jobNamePrefix: ${{ parameters.jobNamePrefix }} platform: ${{ parameters.defaultManagedPlatform }} + enableInternalSources: ${{ parameters.enableInternalSources }} diff --git a/eng/common/core-templates/steps/enable-internal-runtimes.yml b/eng/common/core-templates/steps/enable-internal-runtimes.yml new file mode 100644 index 00000000000..6bdbf62ac50 --- /dev/null +++ b/eng/common/core-templates/steps/enable-internal-runtimes.yml @@ -0,0 +1,32 @@ +# Obtains internal runtime download credentials and populates the 'dotnetbuilds-internal-container-read-token-base64' +# variable with the base64-encoded SAS token, by default + +parameters: +- name: federatedServiceConnection + type: string + default: 'dotnetbuilds-internal-read' +- name: outputVariableName + type: string + default: 'dotnetbuilds-internal-container-read-token-base64' +- name: expiryInHours + type: number + default: 1 +- name: base64Encode + type: boolean + default: true +- name: is1ESPipeline + type: boolean + default: false + +steps: +- ${{ if ne(variables['System.TeamProject'], 'public') }}: + - template: /eng/common/core-templates/steps/get-delegation-sas.yml + parameters: + federatedServiceConnection: ${{ parameters.federatedServiceConnection }} + outputVariableName: ${{ parameters.outputVariableName }} + expiryInHours: ${{ parameters.expiryInHours }} + base64Encode: ${{ parameters.base64Encode }} + storageAccount: dotnetbuilds + container: internal + permissions: rl + is1ESPipeline: ${{ parameters.is1ESPipeline }} \ No newline at end of file diff --git a/eng/common/core-templates/steps/enable-internal-sources.yml b/eng/common/core-templates/steps/enable-internal-sources.yml index 705356c902c..80deddafb1b 100644 --- a/eng/common/core-templates/steps/enable-internal-sources.yml +++ b/eng/common/core-templates/steps/enable-internal-sources.yml @@ -3,6 +3,9 @@ parameters: - name: nugetFederatedServiceConnection type: string default: 'dnceng-artifacts-feeds-read' +- name: is1ESPipeline + type: boolean + default: false steps: - ${{ if ne(variables['System.TeamProject'], 'public') }}: diff --git a/eng/common/core-templates/steps/source-build.yml b/eng/common/core-templates/steps/source-build.yml index 24661a63266..16c778d92cb 100644 --- a/eng/common/core-templates/steps/source-build.yml +++ b/eng/common/core-templates/steps/source-build.yml @@ -14,7 +14,6 @@ parameters: is1ESPipeline: false steps: -- template: /eng/common/core-templates/steps/enable-internal-sources.yml # Build. Keep it self-contained for simple reusability. (No source-build-specific job variables.) - script: | set -x diff --git a/eng/common/cross/armv6/sources.list.bookworm b/eng/common/cross/armv6/sources.list.bookworm new file mode 100644 index 00000000000..10161135265 --- /dev/null +++ b/eng/common/cross/armv6/sources.list.bookworm @@ -0,0 +1,2 @@ +deb http://raspbian.raspberrypi.org/raspbian/ bookworm main contrib non-free rpi +deb-src http://raspbian.raspberrypi.org/raspbian/ bookworm main contrib non-free rpi diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index a8e35df7cee..7455dcb6af4 100644 --- a/eng/common/cross/build-rootfs.sh +++ b/eng/common/cross/build-rootfs.sh @@ -314,6 +314,13 @@ while :; do bullseye) # Debian 11 __CodeName=bullseye + if [[ -z "$__UbuntuRepo" ]]; then + __UbuntuRepo="http://ftp.debian.org/debian/" + fi + ;; + bookworm) # Debian 12 + __CodeName=bookworm + if [[ -z "$__UbuntuRepo" ]]; then __UbuntuRepo="http://ftp.debian.org/debian/" fi diff --git a/eng/common/templates-official/steps/enable-internal-runtimes.yml b/eng/common/templates-official/steps/enable-internal-runtimes.yml new file mode 100644 index 00000000000..f9dd238c6cd --- /dev/null +++ b/eng/common/templates-official/steps/enable-internal-runtimes.yml @@ -0,0 +1,9 @@ +# Obtains internal runtime download credentials and populates the 'dotnetbuilds-internal-container-read-token-base64' +# variable with the base64-encoded SAS token, by default +steps: +- template: /eng/common/core-templates/steps/enable-internal-runtimes.yml + parameters: + is1ESPipeline: true + + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/eng/common/templates/steps/enable-internal-runtimes.yml b/eng/common/templates/steps/enable-internal-runtimes.yml new file mode 100644 index 00000000000..b21a8038cc1 --- /dev/null +++ b/eng/common/templates/steps/enable-internal-runtimes.yml @@ -0,0 +1,10 @@ +# Obtains internal runtime download credentials and populates the 'dotnetbuilds-internal-container-read-token-base64' +# variable with the base64-encoded SAS token, by default + +steps: +- template: /eng/common/core-templates/steps/enable-internal-runtimes.yml + parameters: + is1ESPipeline: false + + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/global.json b/global.json index f45b9db94de..849cf7712d4 100644 --- a/global.json +++ b/global.json @@ -31,7 +31,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24280.3", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24280.3" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24281.1", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24281.1" } } From 6272dcc174ec2569c781fbb86083b4f59f49eb14 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 1 Jun 2024 14:27:48 +0000 Subject: [PATCH 221/568] Update dependencies from https://github.com/dotnet/sdk build 20240531.7 (#6758) [feature/9.x] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NETCore.App.Runtime.win-x64: from 9.0.0-preview.5.24272.2 to 9.0.0-preview.6.24280.11 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) - VS.Redist.Common.NetCore.SharedFramework.x64.9.0: from 9.0.0-preview.5.24272.2 to 9.0.0-preview.6.24280.11 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 99ed7d5cdfa..4334866ec55 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -46,21 +46,21 @@ https://github.com/dotnet/diagnostics 481674f73f11e8096f48820ae133d98c88d64a14 - + https://github.com/dotnet/runtime - 5c06e5d01fa0ea4122e7202cefb921a779f9843a + 9fca0c3dbd3874ed0245b1bdb10547d0ba769d66 https://github.com/dotnet/aspnetcore 5f8f891f8849d21efc5306f3053397203d4b7656 - + https://github.com/dotnet/sdk - b7d72de343041d9aef31ac41348b519ecaf533de + b0e9af0530394fff1237038efcdcdc2590bb9772 - + https://github.com/dotnet/runtime - 5c06e5d01fa0ea4122e7202cefb921a779f9843a + 9fca0c3dbd3874ed0245b1bdb10547d0ba769d66 diff --git a/eng/Versions.props b/eng/Versions.props index 572cb72eed1..ec56a7f9574 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -62,10 +62,10 @@ 9.0.0-preview.24225.1 - 9.0.0-preview.5.24272.2 - 9.0.0-preview.5.24272.2 + 9.0.0-preview.6.24280.11 + 9.0.0-preview.6.24280.11 - 9.0.100-preview.6.24281.4 + 9.0.100-preview.6.24281.7 1.0.528101 From 141f1743eec69fe6b5c7bb7aa22b35db223b0ac8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 3 Jun 2024 13:56:25 +0000 Subject: [PATCH 222/568] Update dependencies from https://github.com/dotnet/sdk build 20240602.3 (#6762) [feature/9.x] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Runtime.win-x64: from 9.0.0-preview.6.24280.8 to 9.0.0-preview.6.24281.4 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) - Microsoft.NETCore.App.Runtime.win-x64: from 9.0.0-preview.6.24280.11 to 9.0.0-preview.6.24281.1 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) - VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0: from 9.0.0-preview.6.24280.8 to 9.0.0-preview.6.24281.4 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) - VS.Redist.Common.NetCore.SharedFramework.x64.9.0: from 9.0.0-preview.6.24280.11 to 9.0.0-preview.6.24281.1 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4334866ec55..45c0eb36751 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/aspnetcore - 5f8f891f8849d21efc5306f3053397203d4b7656 + 83573c72d12e1c2018805bc5d461d730bcb9dcc4 https://github.com/dotnet/diagnostics @@ -46,21 +46,21 @@ https://github.com/dotnet/diagnostics 481674f73f11e8096f48820ae133d98c88d64a14 - + https://github.com/dotnet/runtime - 9fca0c3dbd3874ed0245b1bdb10547d0ba769d66 + 3750ac51619efbbc59bf07d3879758a9c18c4b0e - + https://github.com/dotnet/aspnetcore - 5f8f891f8849d21efc5306f3053397203d4b7656 + 83573c72d12e1c2018805bc5d461d730bcb9dcc4 - + https://github.com/dotnet/sdk - b0e9af0530394fff1237038efcdcdc2590bb9772 + d36d89d4913fb88c663fae4b822383d4a10b33b6 - + https://github.com/dotnet/runtime - 9fca0c3dbd3874ed0245b1bdb10547d0ba769d66 + 3750ac51619efbbc59bf07d3879758a9c18c4b0e diff --git a/eng/Versions.props b/eng/Versions.props index ec56a7f9574..be21f706aca 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,8 +52,8 @@ 9.0.0-beta.24281.1 9.0.0-beta.24281.1 - 9.0.0-preview.6.24280.8 - 9.0.0-preview.6.24280.8 + 9.0.0-preview.6.24281.4 + 9.0.0-preview.6.24281.4 2.0.0-beta4.24209.3 @@ -62,10 +62,10 @@ 9.0.0-preview.24225.1 - 9.0.0-preview.6.24280.11 - 9.0.0-preview.6.24280.11 + 9.0.0-preview.6.24281.1 + 9.0.0-preview.6.24281.1 - 9.0.100-preview.6.24281.7 + 9.0.100-preview.6.24302.3 1.0.528101 From e046aa8769732679679fc930641331b2c8bdb803 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 3 Jun 2024 11:31:53 -0700 Subject: [PATCH 223/568] Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20240603.1 (#6761) Microsoft.CodeAnalysis.NetAnalyzers From Version 9.0.0-preview.24225.1 -> To Version 9.0.0-preview.24303.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 45c0eb36751..9cf0f66a4e1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -18,9 +18,9 @@ - + https://github.com/dotnet/roslyn-analyzers - 8dccccec1ce3bd2fb532ec77d7e092ab9d684db7 + 1d1b6bc0be25482a9105912d71649c03866733b0 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index be21f706aca..92116e13537 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -60,7 +60,7 @@ 8.0.0-preview.24281.1 8.0.0-preview.24281.1 - 9.0.0-preview.24225.1 + 9.0.0-preview.24303.1 9.0.0-preview.6.24281.1 9.0.0-preview.6.24281.1 From 83ca4c6e79256902a4af701cf6f2b79c6bd49317 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 4 Jun 2024 23:04:07 +0000 Subject: [PATCH 224/568] Update dependencies from https://github.com/dotnet/sdk build 20240604.2 (#6766) [feature/9.x] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Runtime.win-x64: from 9.0.0-preview.6.24281.4 to 9.0.0-preview.6.24303.6 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) - VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0: from 9.0.0-preview.6.24281.4 to 9.0.0-preview.6.24303.6 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9cf0f66a4e1..3fa57a9afd1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/aspnetcore - 83573c72d12e1c2018805bc5d461d730bcb9dcc4 + b8566e110b1d3918b5f7319db463aa69dbb0c183 https://github.com/dotnet/diagnostics @@ -50,13 +50,13 @@ https://github.com/dotnet/runtime 3750ac51619efbbc59bf07d3879758a9c18c4b0e - + https://github.com/dotnet/aspnetcore - 83573c72d12e1c2018805bc5d461d730bcb9dcc4 + b8566e110b1d3918b5f7319db463aa69dbb0c183 - + https://github.com/dotnet/sdk - d36d89d4913fb88c663fae4b822383d4a10b33b6 + 36bea1315b44a957c274dc4b4e4b51c2e5c1c651 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 92116e13537..38820aaf206 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,8 +52,8 @@ 9.0.0-beta.24281.1 9.0.0-beta.24281.1 - 9.0.0-preview.6.24281.4 - 9.0.0-preview.6.24281.4 + 9.0.0-preview.6.24303.6 + 9.0.0-preview.6.24303.6 2.0.0-beta4.24209.3 @@ -65,7 +65,7 @@ 9.0.0-preview.6.24281.1 9.0.0-preview.6.24281.1 - 9.0.100-preview.6.24302.3 + 9.0.100-preview.6.24304.2 1.0.528101 From 45fdddf769cbfba3a960375190cb7d5f5a4ea72c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 4 Jun 2024 23:19:09 +0000 Subject: [PATCH 225/568] Update dependencies from https://github.com/dotnet/arcade build 20240603.1 (#6765) [feature/9.x] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- global.json | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3fa57a9afd1..434e0894182 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,25 +22,25 @@ https://github.com/dotnet/roslyn-analyzers 1d1b6bc0be25482a9105912d71649c03866733b0 - + https://github.com/dotnet/arcade - e6b3f32f9855dccbe2447471c8f729b66f17d242 + 2c08708d18855f2e2779ac5d0623a5978751c4f3 - + https://github.com/dotnet/arcade - e6b3f32f9855dccbe2447471c8f729b66f17d242 + 2c08708d18855f2e2779ac5d0623a5978751c4f3 - + https://github.com/dotnet/arcade - e6b3f32f9855dccbe2447471c8f729b66f17d242 + 2c08708d18855f2e2779ac5d0623a5978751c4f3 - + https://github.com/dotnet/arcade - e6b3f32f9855dccbe2447471c8f729b66f17d242 + 2c08708d18855f2e2779ac5d0623a5978751c4f3 - + https://github.com/dotnet/arcade - e6b3f32f9855dccbe2447471c8f729b66f17d242 + 2c08708d18855f2e2779ac5d0623a5978751c4f3 https://github.com/dotnet/diagnostics diff --git a/eng/Versions.props b/eng/Versions.props index 38820aaf206..a74125b0746 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,9 +48,9 @@ --> - 9.0.0-beta.24281.1 - 9.0.0-beta.24281.1 - 9.0.0-beta.24281.1 + 9.0.0-beta.24303.1 + 9.0.0-beta.24303.1 + 9.0.0-beta.24303.1 9.0.0-preview.6.24303.6 9.0.0-preview.6.24303.6 diff --git a/global.json b/global.json index 849cf7712d4..860f58ac87b 100644 --- a/global.json +++ b/global.json @@ -31,7 +31,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24281.1", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24281.1" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24303.1", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24303.1" } } From e4bfe74af62f91c008cea38d84ae70733df34250 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 4 Jun 2024 23:20:23 +0000 Subject: [PATCH 226/568] Update dependencies from https://github.com/dotnet/diagnostics build 20240603.1 (#6764) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 434e0894182..6f3077b6c4f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore b8566e110b1d3918b5f7319db463aa69dbb0c183 - + https://github.com/dotnet/diagnostics - 481674f73f11e8096f48820ae133d98c88d64a14 + 05f88f687a02aa865384beda97a8910d4d57b17b - + https://github.com/dotnet/diagnostics - 481674f73f11e8096f48820ae133d98c88d64a14 + 05f88f687a02aa865384beda97a8910d4d57b17b https://github.com/dotnet/command-line-api @@ -42,9 +42,9 @@ https://github.com/dotnet/arcade 2c08708d18855f2e2779ac5d0623a5978751c4f3 - + https://github.com/dotnet/diagnostics - 481674f73f11e8096f48820ae133d98c88d64a14 + 05f88f687a02aa865384beda97a8910d4d57b17b https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index a74125b0746..4f552cee075 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24209.3 - 8.0.0-preview.24281.1 - 8.0.0-preview.24281.1 + 8.0.0-preview.24303.1 + 8.0.0-preview.24303.1 9.0.0-preview.24303.1 @@ -67,7 +67,7 @@ 9.0.100-preview.6.24304.2 - 1.0.528101 + 1.0.530301 $(MicrosoftNETCoreApp31Version) From 6cdcb8e89862adf3ca64caa9ba73230057d10e44 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 5 Jun 2024 14:13:47 +0000 Subject: [PATCH 227/568] Update dependencies from https://github.com/dotnet/diagnostics build 20240604.1 (#6774) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6f3077b6c4f..196f7d27f1d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore b8566e110b1d3918b5f7319db463aa69dbb0c183 - + https://github.com/dotnet/diagnostics - 05f88f687a02aa865384beda97a8910d4d57b17b + 1c854868f031c1fb9cb2e175baaab120a42b42fd - + https://github.com/dotnet/diagnostics - 05f88f687a02aa865384beda97a8910d4d57b17b + 1c854868f031c1fb9cb2e175baaab120a42b42fd https://github.com/dotnet/command-line-api @@ -42,9 +42,9 @@ https://github.com/dotnet/arcade 2c08708d18855f2e2779ac5d0623a5978751c4f3 - + https://github.com/dotnet/diagnostics - 05f88f687a02aa865384beda97a8910d4d57b17b + 1c854868f031c1fb9cb2e175baaab120a42b42fd https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 4f552cee075..4822f3999a0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24209.3 - 8.0.0-preview.24303.1 - 8.0.0-preview.24303.1 + 8.0.0-preview.24304.1 + 8.0.0-preview.24304.1 9.0.0-preview.24303.1 @@ -67,7 +67,7 @@ 9.0.100-preview.6.24304.2 - 1.0.530301 + 1.0.530401 $(MicrosoftNETCoreApp31Version) From 8c9c63c613db74b1f32ecd56f3669c429bdb093b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 5 Jun 2024 14:16:17 +0000 Subject: [PATCH 228/568] Update dependencies from https://github.com/dotnet/arcade build 20240605.1 (#6775) [feature/9.x] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 +-- eng/Versions.props | 6 +- .../core-templates/post-build/post-build.yml | 3 +- .../post-build/trigger-subscription.yml | 13 -- .../steps/add-build-to-channel.yml | 13 -- .../post-build/add-build-to-channel.ps1 | 48 ------- .../post-build/check-channel-consistency.ps1 | 10 +- eng/common/post-build/nuget-validation.ps1 | 13 +- eng/common/post-build/nuget-verification.ps1 | 121 ++++++++++++++++++ eng/common/post-build/post-build-utils.ps1 | 91 ------------- eng/common/post-build/publish-using-darc.ps1 | 7 +- eng/common/post-build/redact-logs.ps1 | 10 +- .../post-build/sourcelink-validation.ps1 | 10 +- eng/common/post-build/symbols-validation.ps1 | 2 - .../post-build/trigger-subscriptions.ps1 | 64 --------- eng/common/template-guidance.md | 4 - .../post-build/trigger-subscription.yml | 13 -- .../steps/add-build-to-channel.yml | 7 - .../post-build/trigger-subscription.yml | 13 -- .../templates/steps/add-build-to-channel.yml | 7 - global.json | 4 +- 21 files changed, 172 insertions(+), 307 deletions(-) delete mode 100644 eng/common/core-templates/post-build/trigger-subscription.yml delete mode 100644 eng/common/core-templates/steps/add-build-to-channel.yml delete mode 100644 eng/common/post-build/add-build-to-channel.ps1 create mode 100644 eng/common/post-build/nuget-verification.ps1 delete mode 100644 eng/common/post-build/post-build-utils.ps1 delete mode 100644 eng/common/post-build/trigger-subscriptions.ps1 delete mode 100644 eng/common/templates-official/post-build/trigger-subscription.yml delete mode 100644 eng/common/templates-official/steps/add-build-to-channel.yml delete mode 100644 eng/common/templates/post-build/trigger-subscription.yml delete mode 100644 eng/common/templates/steps/add-build-to-channel.yml diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 196f7d27f1d..af811af1c8c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,25 +22,25 @@ https://github.com/dotnet/roslyn-analyzers 1d1b6bc0be25482a9105912d71649c03866733b0 - + https://github.com/dotnet/arcade - 2c08708d18855f2e2779ac5d0623a5978751c4f3 + 1c6e4ad6eedf59f8bdd9e84e811f6d037b8b8087 - + https://github.com/dotnet/arcade - 2c08708d18855f2e2779ac5d0623a5978751c4f3 + 1c6e4ad6eedf59f8bdd9e84e811f6d037b8b8087 - + https://github.com/dotnet/arcade - 2c08708d18855f2e2779ac5d0623a5978751c4f3 + 1c6e4ad6eedf59f8bdd9e84e811f6d037b8b8087 - + https://github.com/dotnet/arcade - 2c08708d18855f2e2779ac5d0623a5978751c4f3 + 1c6e4ad6eedf59f8bdd9e84e811f6d037b8b8087 - + https://github.com/dotnet/arcade - 2c08708d18855f2e2779ac5d0623a5978751c4f3 + 1c6e4ad6eedf59f8bdd9e84e811f6d037b8b8087 https://github.com/dotnet/diagnostics diff --git a/eng/Versions.props b/eng/Versions.props index 4822f3999a0..8758493c7b3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,9 +48,9 @@ --> - 9.0.0-beta.24303.1 - 9.0.0-beta.24303.1 - 9.0.0-beta.24303.1 + 9.0.0-beta.24305.1 + 9.0.0-beta.24305.1 + 9.0.0-beta.24305.1 9.0.0-preview.6.24303.6 9.0.0-preview.6.24303.6 diff --git a/eng/common/core-templates/post-build/post-build.yml b/eng/common/core-templates/post-build/post-build.yml index 865bc1ecb4f..fb15c40c03d 100644 --- a/eng/common/core-templates/post-build/post-build.yml +++ b/eng/common/core-templates/post-build/post-build.yml @@ -145,8 +145,7 @@ stages: displayName: Validate inputs: filePath: $(Build.SourcesDirectory)/eng/common/post-build/nuget-validation.ps1 - arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ - -ToolDestinationPath $(Agent.BuildDirectory)/Extract/ + arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ - job: displayName: Signing Validation diff --git a/eng/common/core-templates/post-build/trigger-subscription.yml b/eng/common/core-templates/post-build/trigger-subscription.yml deleted file mode 100644 index da669030daf..00000000000 --- a/eng/common/core-templates/post-build/trigger-subscription.yml +++ /dev/null @@ -1,13 +0,0 @@ -parameters: - ChannelId: 0 - -steps: -- task: PowerShell@2 - displayName: Triggering subscriptions - inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/trigger-subscriptions.ps1 - arguments: -SourceRepo $(Build.Repository.Uri) - -ChannelId ${{ parameters.ChannelId }} - -MaestroApiAccessToken $(MaestroAccessToken) - -MaestroApiEndPoint $(MaestroApiEndPoint) - -MaestroApiVersion $(MaestroApiVersion) diff --git a/eng/common/core-templates/steps/add-build-to-channel.yml b/eng/common/core-templates/steps/add-build-to-channel.yml deleted file mode 100644 index f67a210d62f..00000000000 --- a/eng/common/core-templates/steps/add-build-to-channel.yml +++ /dev/null @@ -1,13 +0,0 @@ -parameters: - ChannelId: 0 - -steps: -- task: PowerShell@2 - displayName: Add Build to Channel - inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/add-build-to-channel.ps1 - arguments: -BuildId $(BARBuildId) - -ChannelId ${{ parameters.ChannelId }} - -MaestroApiAccessToken $(MaestroApiAccessToken) - -MaestroApiEndPoint $(MaestroApiEndPoint) - -MaestroApiVersion $(MaestroApiVersion) diff --git a/eng/common/post-build/add-build-to-channel.ps1 b/eng/common/post-build/add-build-to-channel.ps1 deleted file mode 100644 index 49938f0c89f..00000000000 --- a/eng/common/post-build/add-build-to-channel.ps1 +++ /dev/null @@ -1,48 +0,0 @@ -param( - [Parameter(Mandatory=$true)][int] $BuildId, - [Parameter(Mandatory=$true)][int] $ChannelId, - [Parameter(Mandatory=$true)][string] $MaestroApiAccessToken, - [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro.dot.net', - [Parameter(Mandatory=$false)][string] $MaestroApiVersion = '2019-01-16' -) - -try { - . $PSScriptRoot\post-build-utils.ps1 - - # Check that the channel we are going to promote the build to exist - $channelInfo = Get-MaestroChannel -ChannelId $ChannelId - - if (!$channelInfo) { - Write-PipelineTelemetryCategory -Category 'PromoteBuild' -Message "Channel with BAR ID $ChannelId was not found in BAR!" - ExitWithExitCode 1 - } - - # Get info about which channel(s) the build has already been promoted to - $buildInfo = Get-MaestroBuild -BuildId $BuildId - - if (!$buildInfo) { - Write-PipelineTelemetryError -Category 'PromoteBuild' -Message "Build with BAR ID $BuildId was not found in BAR!" - ExitWithExitCode 1 - } - - # Find whether the build is already assigned to the channel or not - if ($buildInfo.channels) { - foreach ($channel in $buildInfo.channels) { - if ($channel.Id -eq $ChannelId) { - Write-Host "The build with BAR ID $BuildId is already on channel $ChannelId!" - ExitWithExitCode 0 - } - } - } - - Write-Host "Promoting build '$BuildId' to channel '$ChannelId'." - - Assign-BuildToChannel -BuildId $BuildId -ChannelId $ChannelId - - Write-Host 'done.' -} -catch { - Write-Host $_ - Write-PipelineTelemetryError -Category 'PromoteBuild' -Message "There was an error while trying to promote build '$BuildId' to channel '$ChannelId'" - ExitWithExitCode 1 -} diff --git a/eng/common/post-build/check-channel-consistency.ps1 b/eng/common/post-build/check-channel-consistency.ps1 index 1728f035a93..61208d2d135 100644 --- a/eng/common/post-build/check-channel-consistency.ps1 +++ b/eng/common/post-build/check-channel-consistency.ps1 @@ -4,7 +4,15 @@ param( ) try { - . $PSScriptRoot\post-build-utils.ps1 + $ErrorActionPreference = 'Stop' + Set-StrictMode -Version 2.0 + + # `tools.ps1` checks $ci to perform some actions. Since the post-build + # scripts don't necessarily execute in the same agent that run the + # build.ps1/sh script this variable isn't automatically set. + $ci = $true + $disableConfigureToolsetImport = $true + . $PSScriptRoot\..\tools.ps1 if ($PromoteToChannels -eq "") { Write-PipelineTaskError -Type 'warning' -Message "This build won't publish assets as it's not configured to any Maestro channel. If that wasn't intended use Darc to configure a default channel using add-default-channel for this branch or to promote it to a channel using add-build-to-channel. See https://github.com/dotnet/arcade/blob/main/Documentation/Darc.md#assigning-an-individual-build-to-a-channel for more info." diff --git a/eng/common/post-build/nuget-validation.ps1 b/eng/common/post-build/nuget-validation.ps1 index dab3534ab53..9c81aa43917 100644 --- a/eng/common/post-build/nuget-validation.ps1 +++ b/eng/common/post-build/nuget-validation.ps1 @@ -2,20 +2,11 @@ # tool: https://github.com/NuGet/NuGetGallery/tree/jver-verify/src/VerifyMicrosoftPackage param( - [Parameter(Mandatory=$true)][string] $PackagesPath, # Path to where the packages to be validated are - [Parameter(Mandatory=$true)][string] $ToolDestinationPath # Where the validation tool should be downloaded to + [Parameter(Mandatory=$true)][string] $PackagesPath # Path to where the packages to be validated are ) try { - . $PSScriptRoot\post-build-utils.ps1 - - $url = 'https://raw.githubusercontent.com/NuGet/NuGetGallery/3e25ad135146676bcab0050a516939d9958bfa5d/src/VerifyMicrosoftPackage/verify.ps1' - - New-Item -ItemType 'directory' -Path ${ToolDestinationPath} -Force - - Invoke-WebRequest $url -OutFile ${ToolDestinationPath}\verify.ps1 - - & ${ToolDestinationPath}\verify.ps1 ${PackagesPath}\*.nupkg + & $PSScriptRoot\nuget-verification.ps1 ${PackagesPath}\*.nupkg } catch { Write-Host $_.ScriptStackTrace diff --git a/eng/common/post-build/nuget-verification.ps1 b/eng/common/post-build/nuget-verification.ps1 new file mode 100644 index 00000000000..a365194a938 --- /dev/null +++ b/eng/common/post-build/nuget-verification.ps1 @@ -0,0 +1,121 @@ +<# +.SYNOPSIS + Verifies that Microsoft NuGet packages have proper metadata. +.DESCRIPTION + Downloads a verification tool and runs metadata validation on the provided NuGet packages. This script writes an + error if any of the provided packages fail validation. All arguments provided to this PowerShell script that do not + match PowerShell parameters are passed on to the verification tool downloaded during the execution of this script. +.PARAMETER NuGetExePath + The path to the nuget.exe binary to use. If not provided, nuget.exe will be downloaded into the -DownloadPath + directory. +.PARAMETER PackageSource + The package source to use to download the verification tool. If not provided, nuget.org will be used. +.PARAMETER DownloadPath + The directory path to download the verification tool and nuget.exe to. If not provided, + %TEMP%\NuGet.VerifyNuGetPackage will be used. +.PARAMETER args + Arguments that will be passed to the verification tool. +.EXAMPLE + PS> .\verify.ps1 *.nupkg + Verifies the metadata of all .nupkg files in the currect working directory. +.EXAMPLE + PS> .\verify.ps1 --help + Displays the help text of the downloaded verifiction tool. +.LINK + https://github.com/NuGet/NuGetGallery/blob/master/src/VerifyMicrosoftPackage/README.md +#> + +# This script was copied from https://github.com/NuGet/NuGetGallery/blob/3e25ad135146676bcab0050a516939d9958bfa5d/src/VerifyMicrosoftPackage/verify.ps1 + +[CmdletBinding(PositionalBinding = $false)] +param( + [string]$NuGetExePath, + [string]$PackageSource = "https://api.nuget.org/v3/index.json", + [string]$DownloadPath, + [Parameter(ValueFromRemainingArguments = $true)] + [string[]]$args +) + +# The URL to download nuget.exe. +$nugetExeUrl = "https://dist.nuget.org/win-x86-commandline/v4.9.4/nuget.exe" + +# The package ID of the verification tool. +$packageId = "NuGet.VerifyMicrosoftPackage" + +# The location that nuget.exe and the verification tool will be downloaded to. +if (!$DownloadPath) { + $DownloadPath = (Join-Path $env:TEMP "NuGet.VerifyMicrosoftPackage") +} + +$fence = New-Object -TypeName string -ArgumentList '=', 80 + +# Create the download directory, if it doesn't already exist. +if (!(Test-Path $DownloadPath)) { + New-Item -ItemType Directory $DownloadPath | Out-Null +} +Write-Host "Using download path: $DownloadPath" + +if ($NuGetExePath) { + $nuget = $NuGetExePath +} else { + $downloadedNuGetExe = Join-Path $DownloadPath "nuget.exe" + + # Download nuget.exe, if it doesn't already exist. + if (!(Test-Path $downloadedNuGetExe)) { + Write-Host "Downloading nuget.exe from $nugetExeUrl..." + $ProgressPreference = 'SilentlyContinue' + try { + Invoke-WebRequest $nugetExeUrl -OutFile $downloadedNuGetExe + $ProgressPreference = 'Continue' + } catch { + $ProgressPreference = 'Continue' + Write-Error $_ + Write-Error "nuget.exe failed to download." + exit + } + } + + $nuget = $downloadedNuGetExe +} + +Write-Host "Using nuget.exe path: $nuget" +Write-Host " " + +# Download the latest version of the verification tool. +Write-Host "Downloading the latest version of $packageId from $packageSource..." +Write-Host $fence +& $nuget install $packageId ` + -Prerelease ` + -OutputDirectory $DownloadPath ` + -Source $PackageSource +Write-Host $fence +Write-Host " " + +if ($LASTEXITCODE -ne 0) { + Write-Error "nuget.exe failed to fetch the verify tool." + exit +} + +# Find the most recently downloaded tool +Write-Host "Finding the most recently downloaded verification tool." +$verifyProbePath = Join-Path $DownloadPath "$packageId.*" +$verifyPath = Get-ChildItem -Path $verifyProbePath -Directory ` + | Sort-Object -Property LastWriteTime -Descending ` + | Select-Object -First 1 +$verify = Join-Path $verifyPath "tools\NuGet.VerifyMicrosoftPackage.exe" +Write-Host "Using verification tool: $verify" +Write-Host " " + +# Execute the verification tool. +Write-Host "Executing the verify tool..." +Write-Host $fence +& $verify $args +Write-Host $fence +Write-Host " " + +# Respond to the exit code. +if ($LASTEXITCODE -ne 0) { + Write-Error "The verify tool found some problems." +} else { + Write-Output "The verify tool succeeded." +} diff --git a/eng/common/post-build/post-build-utils.ps1 b/eng/common/post-build/post-build-utils.ps1 deleted file mode 100644 index 534f6988d5b..00000000000 --- a/eng/common/post-build/post-build-utils.ps1 +++ /dev/null @@ -1,91 +0,0 @@ -# Most of the functions in this file require the variables `MaestroApiEndPoint`, -# `MaestroApiVersion` and `MaestroApiAccessToken` to be globally available. - -$ErrorActionPreference = 'Stop' -Set-StrictMode -Version 2.0 - -# `tools.ps1` checks $ci to perform some actions. Since the post-build -# scripts don't necessarily execute in the same agent that run the -# build.ps1/sh script this variable isn't automatically set. -$ci = $true -$disableConfigureToolsetImport = $true -. $PSScriptRoot\..\tools.ps1 - -function Create-MaestroApiRequestHeaders([string]$ContentType = 'application/json') { - Validate-MaestroVars - - $headers = New-Object 'System.Collections.Generic.Dictionary[[String],[String]]' - $headers.Add('Accept', $ContentType) - $headers.Add('Authorization',"Bearer $MaestroApiAccessToken") - return $headers -} - -function Get-MaestroChannel([int]$ChannelId) { - Validate-MaestroVars - - $apiHeaders = Create-MaestroApiRequestHeaders - $apiEndpoint = "$MaestroApiEndPoint/api/channels/${ChannelId}?api-version=$MaestroApiVersion" - - $result = try { Invoke-WebRequest -Method Get -Uri $apiEndpoint -Headers $apiHeaders | ConvertFrom-Json } catch { Write-Host "Error: $_" } - return $result -} - -function Get-MaestroBuild([int]$BuildId) { - Validate-MaestroVars - - $apiHeaders = Create-MaestroApiRequestHeaders -AuthToken $MaestroApiAccessToken - $apiEndpoint = "$MaestroApiEndPoint/api/builds/${BuildId}?api-version=$MaestroApiVersion" - - $result = try { return Invoke-WebRequest -Method Get -Uri $apiEndpoint -Headers $apiHeaders | ConvertFrom-Json } catch { Write-Host "Error: $_" } - return $result -} - -function Get-MaestroSubscriptions([string]$SourceRepository, [int]$ChannelId) { - Validate-MaestroVars - - $SourceRepository = [System.Web.HttpUtility]::UrlEncode($SourceRepository) - $apiHeaders = Create-MaestroApiRequestHeaders -AuthToken $MaestroApiAccessToken - $apiEndpoint = "$MaestroApiEndPoint/api/subscriptions?sourceRepository=$SourceRepository&channelId=$ChannelId&api-version=$MaestroApiVersion" - - $result = try { Invoke-WebRequest -Method Get -Uri $apiEndpoint -Headers $apiHeaders | ConvertFrom-Json } catch { Write-Host "Error: $_" } - return $result -} - -function Assign-BuildToChannel([int]$BuildId, [int]$ChannelId) { - Validate-MaestroVars - - $apiHeaders = Create-MaestroApiRequestHeaders -AuthToken $MaestroApiAccessToken - $apiEndpoint = "$MaestroApiEndPoint/api/channels/${ChannelId}/builds/${BuildId}?api-version=$MaestroApiVersion" - Invoke-WebRequest -Method Post -Uri $apiEndpoint -Headers $apiHeaders | Out-Null -} - -function Trigger-Subscription([string]$SubscriptionId) { - Validate-MaestroVars - - $apiHeaders = Create-MaestroApiRequestHeaders -AuthToken $MaestroApiAccessToken - $apiEndpoint = "$MaestroApiEndPoint/api/subscriptions/$SubscriptionId/trigger?api-version=$MaestroApiVersion" - Invoke-WebRequest -Uri $apiEndpoint -Headers $apiHeaders -Method Post | Out-Null -} - -function Validate-MaestroVars { - try { - Get-Variable MaestroApiEndPoint | Out-Null - Get-Variable MaestroApiVersion | Out-Null - Get-Variable MaestroApiAccessToken | Out-Null - - if (!($MaestroApiEndPoint -Match '^http[s]?://maestro-(int|prod).westus2.cloudapp.azure.com$')) { - Write-PipelineTelemetryError -Category 'MaestroVars' -Message "MaestroApiEndPoint is not a valid Maestro URL. '$MaestroApiEndPoint'" - ExitWithExitCode 1 - } - - if (!($MaestroApiVersion -Match '^[0-9]{4}-[0-9]{2}-[0-9]{2}$')) { - Write-PipelineTelemetryError -Category 'MaestroVars' -Message "MaestroApiVersion does not match a version string in the format yyyy-MM-DD. '$MaestroApiVersion'" - ExitWithExitCode 1 - } - } - catch { - Write-PipelineTelemetryError -Category 'MaestroVars' -Message 'Error: Variables `MaestroApiEndPoint`, `MaestroApiVersion` and `MaestroApiAccessToken` are required while using this script.' - Write-Host $_ - ExitWithExitCode 1 - } -} diff --git a/eng/common/post-build/publish-using-darc.ps1 b/eng/common/post-build/publish-using-darc.ps1 index 5a3a32ea8d7..e831d5c1d29 100644 --- a/eng/common/post-build/publish-using-darc.ps1 +++ b/eng/common/post-build/publish-using-darc.ps1 @@ -10,7 +10,12 @@ param( ) try { - . $PSScriptRoot\post-build-utils.ps1 + # `tools.ps1` checks $ci to perform some actions. Since the post-build + # scripts don't necessarily execute in the same agent that run the + # build.ps1/sh script this variable isn't automatically set. + $ci = $true + $disableConfigureToolsetImport = $true + . $PSScriptRoot\..\tools.ps1 $darc = Get-Darc diff --git a/eng/common/post-build/redact-logs.ps1 b/eng/common/post-build/redact-logs.ps1 index 82d91f6fd02..b7fc1959150 100644 --- a/eng/common/post-build/redact-logs.ps1 +++ b/eng/common/post-build/redact-logs.ps1 @@ -11,7 +11,15 @@ param( ) try { - . $PSScriptRoot\post-build-utils.ps1 + $ErrorActionPreference = 'Stop' + Set-StrictMode -Version 2.0 + + # `tools.ps1` checks $ci to perform some actions. Since the post-build + # scripts don't necessarily execute in the same agent that run the + # build.ps1/sh script this variable isn't automatically set. + $ci = $true + $disableConfigureToolsetImport = $true + . $PSScriptRoot\..\tools.ps1 $packageName = 'binlogtool' diff --git a/eng/common/post-build/sourcelink-validation.ps1 b/eng/common/post-build/sourcelink-validation.ps1 index 4011d324e73..1976ef70fb8 100644 --- a/eng/common/post-build/sourcelink-validation.ps1 +++ b/eng/common/post-build/sourcelink-validation.ps1 @@ -6,7 +6,15 @@ param( [Parameter(Mandatory=$true)][string] $SourcelinkCliVersion # Version of SourceLink CLI to use ) -. $PSScriptRoot\post-build-utils.ps1 +$ErrorActionPreference = 'Stop' +Set-StrictMode -Version 2.0 + +# `tools.ps1` checks $ci to perform some actions. Since the post-build +# scripts don't necessarily execute in the same agent that run the +# build.ps1/sh script this variable isn't automatically set. +$ci = $true +$disableConfigureToolsetImport = $true +. $PSScriptRoot\..\tools.ps1 # Cache/HashMap (File -> Exist flag) used to consult whether a file exist # in the repository at a specific commit point. This is populated by inserting diff --git a/eng/common/post-build/symbols-validation.ps1 b/eng/common/post-build/symbols-validation.ps1 index cd2181bafa0..7146e593ffa 100644 --- a/eng/common/post-build/symbols-validation.ps1 +++ b/eng/common/post-build/symbols-validation.ps1 @@ -322,8 +322,6 @@ function InstallDotnetSymbol { } try { - . $PSScriptRoot\post-build-utils.ps1 - InstallDotnetSymbol foreach ($Job in @(Get-Job)) { diff --git a/eng/common/post-build/trigger-subscriptions.ps1 b/eng/common/post-build/trigger-subscriptions.ps1 deleted file mode 100644 index ac9a95778fc..00000000000 --- a/eng/common/post-build/trigger-subscriptions.ps1 +++ /dev/null @@ -1,64 +0,0 @@ -param( - [Parameter(Mandatory=$true)][string] $SourceRepo, - [Parameter(Mandatory=$true)][int] $ChannelId, - [Parameter(Mandatory=$true)][string] $MaestroApiAccessToken, - [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro.dot.net', - [Parameter(Mandatory=$false)][string] $MaestroApiVersion = '2019-01-16' -) - -try { - . $PSScriptRoot\post-build-utils.ps1 - - # Get all the $SourceRepo subscriptions - $normalizedSourceRepo = $SourceRepo.Replace('dnceng@', '') - $subscriptions = Get-MaestroSubscriptions -SourceRepository $normalizedSourceRepo -ChannelId $ChannelId - - if (!$subscriptions) { - Write-PipelineTelemetryError -Category 'TriggerSubscriptions' -Message "No subscriptions found for source repo '$normalizedSourceRepo' in channel '$ChannelId'" - ExitWithExitCode 0 - } - - $subscriptionsToTrigger = New-Object System.Collections.Generic.List[string] - $failedTriggeredSubscription = $false - - # Get all enabled subscriptions that need dependency flow on 'everyBuild' - foreach ($subscription in $subscriptions) { - if ($subscription.enabled -and $subscription.policy.updateFrequency -like 'everyBuild' -and $subscription.channel.id -eq $ChannelId) { - Write-Host "Should trigger this subscription: ${$subscription.id}" - [void]$subscriptionsToTrigger.Add($subscription.id) - } - } - - foreach ($subscriptionToTrigger in $subscriptionsToTrigger) { - try { - Write-Host "Triggering subscription '$subscriptionToTrigger'." - - Trigger-Subscription -SubscriptionId $subscriptionToTrigger - - Write-Host 'done.' - } - catch - { - Write-Host "There was an error while triggering subscription '$subscriptionToTrigger'" - Write-Host $_ - Write-Host $_.ScriptStackTrace - $failedTriggeredSubscription = $true - } - } - - if ($subscriptionsToTrigger.Count -eq 0) { - Write-Host "No subscription matched source repo '$normalizedSourceRepo' and channel ID '$ChannelId'." - } - elseif ($failedTriggeredSubscription) { - Write-PipelineTelemetryError -Category 'TriggerSubscriptions' -Message 'At least one subscription failed to be triggered...' - ExitWithExitCode 1 - } - else { - Write-Host 'All subscriptions were triggered successfully!' - } -} -catch { - Write-Host $_.ScriptStackTrace - Write-PipelineTelemetryError -Category 'TriggerSubscriptions' -Message $_ - ExitWithExitCode 1 -} diff --git a/eng/common/template-guidance.md b/eng/common/template-guidance.md index c114bc28dcb..5ef6c30ba92 100644 --- a/eng/common/template-guidance.md +++ b/eng/common/template-guidance.md @@ -76,13 +76,11 @@ eng\common\ source-build.yml (shim) post-build\ post-build.yml (shim) - trigger-subscription.yml (shim) common-variabls.yml (shim) setup-maestro-vars.yml (shim) steps\ publish-build-artifacts.yml (logic) publish-pipeline-artifacts.yml (logic) - add-build-channel.yml (shim) component-governance.yml (shim) generate-sbom.yml (shim) publish-logs.yml (shim) @@ -107,9 +105,7 @@ eng\common\ common-variabls.yml (logic) post-build.yml (logic) setup-maestro-vars.yml (logic) - trigger-subscription.yml (logic) steps\ - add-build-to-channel.yml (logic) component-governance.yml (logic) generate-sbom.yml (logic) publish-build-artifacts.yml (redirect) diff --git a/eng/common/templates-official/post-build/trigger-subscription.yml b/eng/common/templates-official/post-build/trigger-subscription.yml deleted file mode 100644 index da669030daf..00000000000 --- a/eng/common/templates-official/post-build/trigger-subscription.yml +++ /dev/null @@ -1,13 +0,0 @@ -parameters: - ChannelId: 0 - -steps: -- task: PowerShell@2 - displayName: Triggering subscriptions - inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/trigger-subscriptions.ps1 - arguments: -SourceRepo $(Build.Repository.Uri) - -ChannelId ${{ parameters.ChannelId }} - -MaestroApiAccessToken $(MaestroAccessToken) - -MaestroApiEndPoint $(MaestroApiEndPoint) - -MaestroApiVersion $(MaestroApiVersion) diff --git a/eng/common/templates-official/steps/add-build-to-channel.yml b/eng/common/templates-official/steps/add-build-to-channel.yml deleted file mode 100644 index 543dea8c696..00000000000 --- a/eng/common/templates-official/steps/add-build-to-channel.yml +++ /dev/null @@ -1,7 +0,0 @@ -steps: -- template: /eng/common/core-templates/steps/add-build-to-channel.yml - parameters: - is1ESPipeline: true - - ${{ each parameter in parameters }}: - ${{ parameter.key }}: ${{ parameter.value }} diff --git a/eng/common/templates/post-build/trigger-subscription.yml b/eng/common/templates/post-build/trigger-subscription.yml deleted file mode 100644 index da669030daf..00000000000 --- a/eng/common/templates/post-build/trigger-subscription.yml +++ /dev/null @@ -1,13 +0,0 @@ -parameters: - ChannelId: 0 - -steps: -- task: PowerShell@2 - displayName: Triggering subscriptions - inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/trigger-subscriptions.ps1 - arguments: -SourceRepo $(Build.Repository.Uri) - -ChannelId ${{ parameters.ChannelId }} - -MaestroApiAccessToken $(MaestroAccessToken) - -MaestroApiEndPoint $(MaestroApiEndPoint) - -MaestroApiVersion $(MaestroApiVersion) diff --git a/eng/common/templates/steps/add-build-to-channel.yml b/eng/common/templates/steps/add-build-to-channel.yml deleted file mode 100644 index 42bbba161b9..00000000000 --- a/eng/common/templates/steps/add-build-to-channel.yml +++ /dev/null @@ -1,7 +0,0 @@ -steps: -- template: /eng/common/core-templates/steps/add-build-to-channel.yml - parameters: - is1ESPipeline: false - - ${{ each parameter in parameters }}: - ${{ parameter.key }}: ${{ parameter.value }} diff --git a/global.json b/global.json index 860f58ac87b..98b8dc4393c 100644 --- a/global.json +++ b/global.json @@ -31,7 +31,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24303.1", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24303.1" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24305.1", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24305.1" } } From a856aec657e9dc1b93d06c7c15a4318e89259c22 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 5 Jun 2024 14:22:50 +0000 Subject: [PATCH 229/568] Update dependencies from https://github.com/dotnet/sdk build 20240605.1 (#6777) [feature/9.x] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Runtime.win-x64: from 9.0.0-preview.6.24303.6 to 9.0.0-preview.6.24304.8 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) - VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0: from 9.0.0-preview.6.24303.6 to 9.0.0-preview.6.24304.8 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index af811af1c8c..44cfb89b54c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/aspnetcore - b8566e110b1d3918b5f7319db463aa69dbb0c183 + 228900c8b3692f8684f4dc9c7cd5d9d53a276a8e https://github.com/dotnet/diagnostics @@ -50,13 +50,13 @@ https://github.com/dotnet/runtime 3750ac51619efbbc59bf07d3879758a9c18c4b0e - + https://github.com/dotnet/aspnetcore - b8566e110b1d3918b5f7319db463aa69dbb0c183 + 228900c8b3692f8684f4dc9c7cd5d9d53a276a8e - + https://github.com/dotnet/sdk - 36bea1315b44a957c274dc4b4e4b51c2e5c1c651 + 5a8b156bcc5b496d6de43c8cece1bacbb7fee46f https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 8758493c7b3..20acb150989 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,8 +52,8 @@ 9.0.0-beta.24305.1 9.0.0-beta.24305.1 - 9.0.0-preview.6.24303.6 - 9.0.0-preview.6.24303.6 + 9.0.0-preview.6.24304.8 + 9.0.0-preview.6.24304.8 2.0.0-beta4.24209.3 @@ -65,7 +65,7 @@ 9.0.0-preview.6.24281.1 9.0.0-preview.6.24281.1 - 9.0.100-preview.6.24304.2 + 9.0.100-preview.6.24305.1 1.0.530401 From b939d08217b0b46602fabf55ff7750268ff99ea7 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 5 Jun 2024 11:00:56 -0700 Subject: [PATCH 230/568] update release information (#6779) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 20acb150989..2f3fa6d46aa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -5,7 +5,7 @@ https://github.com/dotnet/dotnet-monitor 9.0.0 preview - 5 + 6 true - 9.0.0-preview.24303.1 + 9.0.0-preview.24304.1 9.0.0-preview.6.24281.1 9.0.0-preview.6.24281.1 From 708cda18ad08a084dd945708f3930aff19586f25 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 6 Jun 2024 13:53:10 +0000 Subject: [PATCH 232/568] Update dependencies from https://github.com/dotnet/diagnostics build 20240605.1 (#6786) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0cb984ca9da..696de538b80 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore 228900c8b3692f8684f4dc9c7cd5d9d53a276a8e - + https://github.com/dotnet/diagnostics - 1c854868f031c1fb9cb2e175baaab120a42b42fd + cc5eca29afa2d9cacf6700ddc8d843082b5955c6 - + https://github.com/dotnet/diagnostics - 1c854868f031c1fb9cb2e175baaab120a42b42fd + cc5eca29afa2d9cacf6700ddc8d843082b5955c6 https://github.com/dotnet/command-line-api @@ -42,9 +42,9 @@ https://github.com/dotnet/arcade 1c6e4ad6eedf59f8bdd9e84e811f6d037b8b8087 - + https://github.com/dotnet/diagnostics - 1c854868f031c1fb9cb2e175baaab120a42b42fd + cc5eca29afa2d9cacf6700ddc8d843082b5955c6 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 6935bfa14f8..eb12779dd8c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24209.3 - 8.0.0-preview.24304.1 - 8.0.0-preview.24304.1 + 8.0.0-preview.24305.1 + 8.0.0-preview.24305.1 9.0.0-preview.24304.1 @@ -67,7 +67,7 @@ 9.0.100-preview.6.24305.1 - 1.0.530401 + 1.0.530501 $(MicrosoftNETCoreApp31Version) From cd94a183d2e846298028d7a4bd22ae94783d42e9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 6 Jun 2024 14:00:42 +0000 Subject: [PATCH 233/568] Update dependencies from https://github.com/dotnet/arcade build 20240605.5 (#6787) [feature/9.x] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- eng/common/cross/build-android-rootfs.sh | 8 ++++---- global.json | 4 ++-- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 696de538b80..1f61aa10dee 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,25 +22,25 @@ https://github.com/dotnet/roslyn-analyzers 333f90a3051f084e7af42b516b6bdd7ae8e004f3 - + https://github.com/dotnet/arcade - 1c6e4ad6eedf59f8bdd9e84e811f6d037b8b8087 + f00e1ca5808b15b206042d50cad7cc1c69d3d938 - + https://github.com/dotnet/arcade - 1c6e4ad6eedf59f8bdd9e84e811f6d037b8b8087 + f00e1ca5808b15b206042d50cad7cc1c69d3d938 - + https://github.com/dotnet/arcade - 1c6e4ad6eedf59f8bdd9e84e811f6d037b8b8087 + f00e1ca5808b15b206042d50cad7cc1c69d3d938 - + https://github.com/dotnet/arcade - 1c6e4ad6eedf59f8bdd9e84e811f6d037b8b8087 + f00e1ca5808b15b206042d50cad7cc1c69d3d938 - + https://github.com/dotnet/arcade - 1c6e4ad6eedf59f8bdd9e84e811f6d037b8b8087 + f00e1ca5808b15b206042d50cad7cc1c69d3d938 https://github.com/dotnet/diagnostics diff --git a/eng/Versions.props b/eng/Versions.props index eb12779dd8c..c18e98ba170 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,9 +48,9 @@ --> - 9.0.0-beta.24305.1 - 9.0.0-beta.24305.1 - 9.0.0-beta.24305.1 + 9.0.0-beta.24305.5 + 9.0.0-beta.24305.5 + 9.0.0-beta.24305.5 9.0.0-preview.6.24304.8 9.0.0-preview.6.24304.8 diff --git a/eng/common/cross/build-android-rootfs.sh b/eng/common/cross/build-android-rootfs.sh index f163fb9dae9..7e9ba2b75ed 100644 --- a/eng/common/cross/build-android-rootfs.sh +++ b/eng/common/cross/build-android-rootfs.sh @@ -5,15 +5,15 @@ __NDK_Version=r21 usage() { echo "Creates a toolchain and sysroot used for cross-compiling for Android." - echo. + echo echo "Usage: $0 [BuildArch] [ApiLevel]" - echo. + echo echo "BuildArch is the target architecture of Android. Currently only arm64 is supported." echo "ApiLevel is the target Android API level. API levels usually match to Android releases. See https://source.android.com/source/build-numbers.html" - echo. + echo echo "By default, the toolchain and sysroot will be generated in cross/android-rootfs/toolchain/[BuildArch]. You can change this behavior" echo "by setting the TOOLCHAIN_DIR environment variable" - echo. + echo echo "By default, the NDK will be downloaded into the cross/android-rootfs/android-ndk-$__NDK_Version directory. If you already have an NDK installation," echo "you can set the NDK_DIR environment variable to have this script use that installation of the NDK." echo "By default, this script will generate a file, android_platform, in the root of the ROOTFS_DIR directory that contains the RID for the supported and tested Android build: android.28-arm64. This file is to replace '/etc/os-release', which is not available for Android." diff --git a/global.json b/global.json index 98b8dc4393c..175ad4660b9 100644 --- a/global.json +++ b/global.json @@ -31,7 +31,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24305.1", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24305.1" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24305.5", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24305.5" } } From f810fe80ee2d2e339b3dfc0e7fd51a5598aa4942 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 6 Jun 2024 14:06:31 +0000 Subject: [PATCH 234/568] Update dependencies from https://github.com/dotnet/sdk build 20240605.17 (#6788) [feature/9.x] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Runtime.win-x64: from 9.0.0-preview.6.24304.8 to 9.0.0-preview.6.24305.3 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) - VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0: from 9.0.0-preview.6.24304.8 to 9.0.0-preview.6.24305.3 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1f61aa10dee..6965ffe3f7b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/aspnetcore - 228900c8b3692f8684f4dc9c7cd5d9d53a276a8e + 8adff2c3cf5a5f08ff8cf7715af7b3f540339c12 https://github.com/dotnet/diagnostics @@ -50,13 +50,13 @@ https://github.com/dotnet/runtime 3750ac51619efbbc59bf07d3879758a9c18c4b0e - + https://github.com/dotnet/aspnetcore - 228900c8b3692f8684f4dc9c7cd5d9d53a276a8e + 8adff2c3cf5a5f08ff8cf7715af7b3f540339c12 - + https://github.com/dotnet/sdk - 5a8b156bcc5b496d6de43c8cece1bacbb7fee46f + 6ecc573c92a1237627b37310c6aec65ff3caacc8 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index c18e98ba170..3aafde38dfd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,8 +52,8 @@ 9.0.0-beta.24305.5 9.0.0-beta.24305.5 - 9.0.0-preview.6.24304.8 - 9.0.0-preview.6.24304.8 + 9.0.0-preview.6.24305.3 + 9.0.0-preview.6.24305.3 2.0.0-beta4.24209.3 @@ -65,7 +65,7 @@ 9.0.0-preview.6.24281.1 9.0.0-preview.6.24281.1 - 9.0.100-preview.6.24305.1 + 9.0.100-preview.6.24305.17 1.0.530501 From 07bd424992c9fa7e0218ebc6838b99dbb65353bc Mon Sep 17 00:00:00 2001 From: Wiktor Kopec Date: Thu, 6 Jun 2024 15:40:58 -0700 Subject: [PATCH 235/568] Fixup nuget authentication (#6789) --- eng/pipelines/steps/setup-nuget-sources.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/eng/pipelines/steps/setup-nuget-sources.yml b/eng/pipelines/steps/setup-nuget-sources.yml index 386306d03de..5c12f50f91f 100644 --- a/eng/pipelines/steps/setup-nuget-sources.yml +++ b/eng/pipelines/steps/setup-nuget-sources.yml @@ -8,7 +8,7 @@ steps: displayName: Setup Private Feeds Credentials inputs: filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 - arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token + arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config env: Token: $(dn-bot-dnceng-artifact-feeds-rw) - ${{ else }}: @@ -19,3 +19,7 @@ steps: arguments: $(Build.SourcesDirectory)/NuGet.config $Token env: Token: $(dn-bot-dnceng-artifact-feeds-rw) +# Run the NuGetAuthenticate task after the internal feeds are added to the nuget.config +# This ensures that creds are set appropriately for all feeds in the config, and that the +# credential provider is installed. +- task: NuGetAuthenticate@1 \ No newline at end of file From 1e733be57a511597371669a2c09fa33b0221e2b3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 7 Jun 2024 13:56:28 +0000 Subject: [PATCH 236/568] Update dependencies from https://github.com/dotnet/diagnostics build 20240606.2 (#6793) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6965ffe3f7b..c3df630d0fb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore 8adff2c3cf5a5f08ff8cf7715af7b3f540339c12 - + https://github.com/dotnet/diagnostics - cc5eca29afa2d9cacf6700ddc8d843082b5955c6 + 5bf29f28ab61dec78a4d9a498f6b7ac0f2ded43a - + https://github.com/dotnet/diagnostics - cc5eca29afa2d9cacf6700ddc8d843082b5955c6 + 5bf29f28ab61dec78a4d9a498f6b7ac0f2ded43a https://github.com/dotnet/command-line-api @@ -42,9 +42,9 @@ https://github.com/dotnet/arcade f00e1ca5808b15b206042d50cad7cc1c69d3d938 - + https://github.com/dotnet/diagnostics - cc5eca29afa2d9cacf6700ddc8d843082b5955c6 + 5bf29f28ab61dec78a4d9a498f6b7ac0f2ded43a https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 3aafde38dfd..c27b2c05d50 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24209.3 - 8.0.0-preview.24305.1 - 8.0.0-preview.24305.1 + 8.0.0-preview.24306.2 + 8.0.0-preview.24306.2 9.0.0-preview.24304.1 @@ -67,7 +67,7 @@ 9.0.100-preview.6.24305.17 - 1.0.530501 + 1.0.530602 $(MicrosoftNETCoreApp31Version) From 7cc2a40cbfb53264e72546bf4f6259d6ad926400 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 7 Jun 2024 13:58:45 +0000 Subject: [PATCH 237/568] Update dependencies from https://github.com/dotnet/arcade build 20240606.4 (#6794) [feature/9.x] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- eng/common/post-build/publish-using-darc.ps1 | 1 + global.json | 4 ++-- 4 files changed, 16 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c3df630d0fb..d6c312bd7b9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,25 +22,25 @@ https://github.com/dotnet/roslyn-analyzers 333f90a3051f084e7af42b516b6bdd7ae8e004f3 - + https://github.com/dotnet/arcade - f00e1ca5808b15b206042d50cad7cc1c69d3d938 + 7507f80c8db285bbc9939c1dff522a761cf4edc0 - + https://github.com/dotnet/arcade - f00e1ca5808b15b206042d50cad7cc1c69d3d938 + 7507f80c8db285bbc9939c1dff522a761cf4edc0 - + https://github.com/dotnet/arcade - f00e1ca5808b15b206042d50cad7cc1c69d3d938 + 7507f80c8db285bbc9939c1dff522a761cf4edc0 - + https://github.com/dotnet/arcade - f00e1ca5808b15b206042d50cad7cc1c69d3d938 + 7507f80c8db285bbc9939c1dff522a761cf4edc0 - + https://github.com/dotnet/arcade - f00e1ca5808b15b206042d50cad7cc1c69d3d938 + 7507f80c8db285bbc9939c1dff522a761cf4edc0 https://github.com/dotnet/diagnostics diff --git a/eng/Versions.props b/eng/Versions.props index c27b2c05d50..a8dd8bb8b68 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,9 +48,9 @@ --> - 9.0.0-beta.24305.5 - 9.0.0-beta.24305.5 - 9.0.0-beta.24305.5 + 9.0.0-beta.24306.4 + 9.0.0-beta.24306.4 + 9.0.0-beta.24306.4 9.0.0-preview.6.24305.3 9.0.0-preview.6.24305.3 diff --git a/eng/common/post-build/publish-using-darc.ps1 b/eng/common/post-build/publish-using-darc.ps1 index e831d5c1d29..d6a39e31cc3 100644 --- a/eng/common/post-build/publish-using-darc.ps1 +++ b/eng/common/post-build/publish-using-darc.ps1 @@ -43,6 +43,7 @@ try { --azdev-pat $AzdoToken ` --bar-uri $MaestroApiEndPoint ` --password $MaestroToken ` + --disable-interactive-auth ` @optionalParams if ($LastExitCode -ne 0) { diff --git a/global.json b/global.json index 175ad4660b9..0180d30149c 100644 --- a/global.json +++ b/global.json @@ -31,7 +31,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24305.5", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24305.5" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24306.4", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24306.4" } } From 5214c12a6de3feb3999f303bd49d81f3c936fd58 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 7 Jun 2024 14:00:21 +0000 Subject: [PATCH 238/568] Update dependencies from https://github.com/dotnet/sdk build 20240607.5 (#6796) [feature/9.x] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Runtime.win-x64: from 9.0.0-preview.6.24305.3 to 9.0.0-preview.6.24306.5 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) - Microsoft.NETCore.App.Runtime.win-x64: from 9.0.0-preview.6.24281.1 to 9.0.0-preview.6.24306.8 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) - VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0: from 9.0.0-preview.6.24305.3 to 9.0.0-preview.6.24306.5 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) - VS.Redist.Common.NetCore.SharedFramework.x64.9.0: from 9.0.0-preview.6.24281.1 to 9.0.0-preview.6.24306.8 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d6c312bd7b9..5e69861b71f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/aspnetcore - 8adff2c3cf5a5f08ff8cf7715af7b3f540339c12 + 10517269f40d53eb22cce6b4d520ed27ed1e1b9f https://github.com/dotnet/diagnostics @@ -46,21 +46,21 @@ https://github.com/dotnet/diagnostics 5bf29f28ab61dec78a4d9a498f6b7ac0f2ded43a - + https://github.com/dotnet/runtime - 3750ac51619efbbc59bf07d3879758a9c18c4b0e + f6a7ebbb81540401e6b5520afa3ba87c2bd6bcfe - + https://github.com/dotnet/aspnetcore - 8adff2c3cf5a5f08ff8cf7715af7b3f540339c12 + 10517269f40d53eb22cce6b4d520ed27ed1e1b9f - + https://github.com/dotnet/sdk - 6ecc573c92a1237627b37310c6aec65ff3caacc8 + b1d6cfcdb15e9b4fd28e5cead8e452083021f29d - + https://github.com/dotnet/runtime - 3750ac51619efbbc59bf07d3879758a9c18c4b0e + f6a7ebbb81540401e6b5520afa3ba87c2bd6bcfe diff --git a/eng/Versions.props b/eng/Versions.props index a8dd8bb8b68..9d5024b8fab 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,8 +52,8 @@ 9.0.0-beta.24306.4 9.0.0-beta.24306.4 - 9.0.0-preview.6.24305.3 - 9.0.0-preview.6.24305.3 + 9.0.0-preview.6.24306.5 + 9.0.0-preview.6.24306.5 2.0.0-beta4.24209.3 @@ -62,10 +62,10 @@ 9.0.0-preview.24304.1 - 9.0.0-preview.6.24281.1 - 9.0.0-preview.6.24281.1 + 9.0.0-preview.6.24306.8 + 9.0.0-preview.6.24306.8 - 9.0.100-preview.6.24305.17 + 9.0.100-preview.6.24307.5 1.0.530602 From 27ae7ee95a0cca39a7206e34930c424cab7a7c8f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 7 Jun 2024 09:02:53 -0700 Subject: [PATCH 239/568] Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20240606.2 (#6795) Microsoft.CodeAnalysis.NetAnalyzers From Version 9.0.0-preview.24304.1 -> To Version 9.0.0-preview.24306.2 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5e69861b71f..013eac9ea1e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -18,9 +18,9 @@ - + https://github.com/dotnet/roslyn-analyzers - 333f90a3051f084e7af42b516b6bdd7ae8e004f3 + 4d5fd9da36d64d4c3370b8813122e226844fc6ed https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 9d5024b8fab..5babdfd66a1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -60,7 +60,7 @@ 8.0.0-preview.24306.2 8.0.0-preview.24306.2 - 9.0.0-preview.24304.1 + 9.0.0-preview.24306.2 9.0.0-preview.6.24306.8 9.0.0-preview.6.24306.8 From a5c0f976b77d254fd5e80255d7ca1e4ccbce08f2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 8 Jun 2024 14:19:01 +0000 Subject: [PATCH 240/568] Update dependencies from https://github.com/dotnet/diagnostics build 20240607.1 (#6800) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 013eac9ea1e..d89acf789b8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore 10517269f40d53eb22cce6b4d520ed27ed1e1b9f - + https://github.com/dotnet/diagnostics - 5bf29f28ab61dec78a4d9a498f6b7ac0f2ded43a + 33d8bf23a6566cd3fb9055acfc9f1141391d5421 - + https://github.com/dotnet/diagnostics - 5bf29f28ab61dec78a4d9a498f6b7ac0f2ded43a + 33d8bf23a6566cd3fb9055acfc9f1141391d5421 https://github.com/dotnet/command-line-api @@ -42,9 +42,9 @@ https://github.com/dotnet/arcade 7507f80c8db285bbc9939c1dff522a761cf4edc0 - + https://github.com/dotnet/diagnostics - 5bf29f28ab61dec78a4d9a498f6b7ac0f2ded43a + 33d8bf23a6566cd3fb9055acfc9f1141391d5421 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 5babdfd66a1..0e435322af1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24209.3 - 8.0.0-preview.24306.2 - 8.0.0-preview.24306.2 + 8.0.0-preview.24307.1 + 8.0.0-preview.24307.1 9.0.0-preview.24306.2 @@ -67,7 +67,7 @@ 9.0.100-preview.6.24307.5 - 1.0.530602 + 1.0.530701 $(MicrosoftNETCoreApp31Version) From 33395b135f3d1d205b3a5e19a5fd8987d0da0964 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 8 Jun 2024 14:29:43 +0000 Subject: [PATCH 241/568] Update dependencies from https://github.com/dotnet/sdk build 20240607.18 (#6801) [feature/9.x] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NETCore.App.Runtime.win-x64: from 9.0.0-preview.6.24306.8 to 9.0.0-preview.6.24307.2 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) - VS.Redist.Common.NetCore.SharedFramework.x64.9.0: from 9.0.0-preview.6.24306.8 to 9.0.0-preview.6.24307.2 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d89acf789b8..228bf9d3612 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -46,21 +46,21 @@ https://github.com/dotnet/diagnostics 33d8bf23a6566cd3fb9055acfc9f1141391d5421 - + https://github.com/dotnet/runtime - f6a7ebbb81540401e6b5520afa3ba87c2bd6bcfe + 8fac5af2b11dc98fa0504f6fd06df790164ec958 https://github.com/dotnet/aspnetcore 10517269f40d53eb22cce6b4d520ed27ed1e1b9f - + https://github.com/dotnet/sdk - b1d6cfcdb15e9b4fd28e5cead8e452083021f29d + cc17704acfbee4b2ef49a82aa6f65aaa9cafffef - + https://github.com/dotnet/runtime - f6a7ebbb81540401e6b5520afa3ba87c2bd6bcfe + 8fac5af2b11dc98fa0504f6fd06df790164ec958 diff --git a/eng/Versions.props b/eng/Versions.props index 0e435322af1..80d7463ccad 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -62,10 +62,10 @@ 9.0.0-preview.24306.2 - 9.0.0-preview.6.24306.8 - 9.0.0-preview.6.24306.8 + 9.0.0-preview.6.24307.2 + 9.0.0-preview.6.24307.2 - 9.0.100-preview.6.24307.5 + 9.0.100-preview.6.24307.18 1.0.530701 From b2090f503738ffd917247211b41fc8a7945ee79d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 10 Jun 2024 13:52:24 +0000 Subject: [PATCH 242/568] Update dependencies from https://github.com/dotnet/sdk build 20240609.2 (#6805) [feature/9.x] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Runtime.win-x64: from 9.0.0-preview.6.24306.5 to 9.0.0-preview.6.24307.5 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) - VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0: from 9.0.0-preview.6.24306.5 to 9.0.0-preview.6.24307.5 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 228bf9d3612..7d7f0e6eb8a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/aspnetcore - 10517269f40d53eb22cce6b4d520ed27ed1e1b9f + 206b0aeca39d5eb12e55ce4e35ef4c8b9bc63c86 https://github.com/dotnet/diagnostics @@ -50,13 +50,13 @@ https://github.com/dotnet/runtime 8fac5af2b11dc98fa0504f6fd06df790164ec958 - + https://github.com/dotnet/aspnetcore - 10517269f40d53eb22cce6b4d520ed27ed1e1b9f + 206b0aeca39d5eb12e55ce4e35ef4c8b9bc63c86 - + https://github.com/dotnet/sdk - cc17704acfbee4b2ef49a82aa6f65aaa9cafffef + 9099d03a90a003dd2bfee3e2147518c8158c269a https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 80d7463ccad..6460b41c145 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,8 +52,8 @@ 9.0.0-beta.24306.4 9.0.0-beta.24306.4 - 9.0.0-preview.6.24306.5 - 9.0.0-preview.6.24306.5 + 9.0.0-preview.6.24307.5 + 9.0.0-preview.6.24307.5 2.0.0-beta4.24209.3 @@ -65,7 +65,7 @@ 9.0.0-preview.6.24307.2 9.0.0-preview.6.24307.2 - 9.0.100-preview.6.24307.18 + 9.0.100-preview.6.24309.2 1.0.530701 From 126d11fc2e349292311f8cdf82ee2c7e0a99fd6f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 11 Jun 2024 14:31:48 +0000 Subject: [PATCH 243/568] Update dependencies from https://github.com/dotnet/arcade build 20240611.1 (#6807) [feature/9.x] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- eng/common/post-build/publish-using-darc.ps1 | 2 +- eng/common/tools.ps1 | 2 +- eng/common/tools.sh | 4 ++-- global.json | 4 ++-- 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7d7f0e6eb8a..1ab1a2f5a0d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,25 +22,25 @@ https://github.com/dotnet/roslyn-analyzers 4d5fd9da36d64d4c3370b8813122e226844fc6ed - + https://github.com/dotnet/arcade - 7507f80c8db285bbc9939c1dff522a761cf4edc0 + 11f7d1ae1a87b5d8c469fa00f22a184d2f5d1319 - + https://github.com/dotnet/arcade - 7507f80c8db285bbc9939c1dff522a761cf4edc0 + 11f7d1ae1a87b5d8c469fa00f22a184d2f5d1319 - + https://github.com/dotnet/arcade - 7507f80c8db285bbc9939c1dff522a761cf4edc0 + 11f7d1ae1a87b5d8c469fa00f22a184d2f5d1319 - + https://github.com/dotnet/arcade - 7507f80c8db285bbc9939c1dff522a761cf4edc0 + 11f7d1ae1a87b5d8c469fa00f22a184d2f5d1319 - + https://github.com/dotnet/arcade - 7507f80c8db285bbc9939c1dff522a761cf4edc0 + 11f7d1ae1a87b5d8c469fa00f22a184d2f5d1319 https://github.com/dotnet/diagnostics diff --git a/eng/Versions.props b/eng/Versions.props index 6460b41c145..70ba8e6ea85 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,9 +48,9 @@ --> - 9.0.0-beta.24306.4 - 9.0.0-beta.24306.4 - 9.0.0-beta.24306.4 + 9.0.0-beta.24311.1 + 9.0.0-beta.24311.1 + 9.0.0-beta.24311.1 9.0.0-preview.6.24307.5 9.0.0-preview.6.24307.5 diff --git a/eng/common/post-build/publish-using-darc.ps1 b/eng/common/post-build/publish-using-darc.ps1 index d6a39e31cc3..8bc107fa738 100644 --- a/eng/common/post-build/publish-using-darc.ps1 +++ b/eng/common/post-build/publish-using-darc.ps1 @@ -43,7 +43,7 @@ try { --azdev-pat $AzdoToken ` --bar-uri $MaestroApiEndPoint ` --password $MaestroToken ` - --disable-interactive-auth ` + --ci ` @optionalParams if ($LastExitCode -ne 0) { diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 0febe696dbd..9574f4eb9df 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -653,7 +653,7 @@ function GetNuGetPackageCachePath() { $env:NUGET_PACKAGES = Join-Path $env:UserProfile '.nuget\packages\' } else { $env:NUGET_PACKAGES = Join-Path $RepoRoot '.packages\' - $env:RESTORENOCACHE = $true + $env:RESTORENOHTTPCACHE = $true } } diff --git a/eng/common/tools.sh b/eng/common/tools.sh index a4f5d1b7761..5e4f910fc83 100644 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -347,14 +347,14 @@ function InitializeBuildTool { fi } -# Set RestoreNoCache as a workaround for https://github.com/NuGet/Home/issues/3116 +# Set RestoreNoHttpCache as a workaround for https://github.com/NuGet/Home/issues/3116 function GetNuGetPackageCachePath { if [[ -z ${NUGET_PACKAGES:-} ]]; then if [[ "$use_global_nuget_cache" == true ]]; then export NUGET_PACKAGES="$HOME/.nuget/packages" else export NUGET_PACKAGES="$repo_root/.packages" - export RESTORENOCACHE=true + export RESTORENOHTTPCACHE=true fi fi diff --git a/global.json b/global.json index 0180d30149c..a9b32e1db0e 100644 --- a/global.json +++ b/global.json @@ -31,7 +31,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24306.4", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24306.4" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24311.1", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24311.1" } } From b6db090764855e42537b73bcd0475980e969157c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 12 Jun 2024 14:15:22 +0000 Subject: [PATCH 244/568] Update dependencies from https://github.com/dotnet/sdk build 20240612.2 (#6816) [feature/9.x] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Runtime.win-x64: from 9.0.0-preview.6.24307.5 to 9.0.0-preview.6.24309.2 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) - VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0: from 9.0.0-preview.6.24307.5 to 9.0.0-preview.6.24309.2 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1ab1a2f5a0d..27146fbd8de 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/aspnetcore - 206b0aeca39d5eb12e55ce4e35ef4c8b9bc63c86 + 7f2dfb0020ff29ab57df31e910f2b2d5ef48bf82 https://github.com/dotnet/diagnostics @@ -50,13 +50,13 @@ https://github.com/dotnet/runtime 8fac5af2b11dc98fa0504f6fd06df790164ec958 - + https://github.com/dotnet/aspnetcore - 206b0aeca39d5eb12e55ce4e35ef4c8b9bc63c86 + 7f2dfb0020ff29ab57df31e910f2b2d5ef48bf82 - + https://github.com/dotnet/sdk - 9099d03a90a003dd2bfee3e2147518c8158c269a + de339b2efe8805dd45fb25060d353121faa42a3a https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 70ba8e6ea85..ec40e312ad0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,8 +52,8 @@ 9.0.0-beta.24311.1 9.0.0-beta.24311.1 - 9.0.0-preview.6.24307.5 - 9.0.0-preview.6.24307.5 + 9.0.0-preview.6.24309.2 + 9.0.0-preview.6.24309.2 2.0.0-beta4.24209.3 @@ -65,7 +65,7 @@ 9.0.0-preview.6.24307.2 9.0.0-preview.6.24307.2 - 9.0.100-preview.6.24309.2 + 9.0.100-preview.6.24312.2 1.0.530701 From 2e28231a92f6b8d53862fa08a91e9f31abb19f8f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 13 Jun 2024 14:05:49 +0000 Subject: [PATCH 245/568] Update dependencies from https://github.com/dotnet/sdk build 20240613.1 (#6822) [feature/9.x] Update dependencies from dotnet/sdk --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 27146fbd8de..21805324171 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,9 +54,9 @@ https://github.com/dotnet/aspnetcore 7f2dfb0020ff29ab57df31e910f2b2d5ef48bf82 - + https://github.com/dotnet/sdk - de339b2efe8805dd45fb25060d353121faa42a3a + 3ed3bf67670c92e675313b43c5e733755e781b3d https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index ec40e312ad0..5e06c93cef7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,7 +65,7 @@ 9.0.0-preview.6.24307.2 9.0.0-preview.6.24307.2 - 9.0.100-preview.6.24312.2 + 9.0.100-preview.6.24313.1 1.0.530701 From d56ed6db73f68560848bbbca550dfd0d5037b8ff Mon Sep 17 00:00:00 2001 From: Wiktor Kopec Date: Thu, 13 Jun 2024 14:49:33 -0700 Subject: [PATCH 246/568] Update global.json (#6821) --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index a9b32e1db0e..17e91d612f9 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "9.0.100-preview.4.24267.66", + "dotnet": "9.0.100-preview.5.24307.3", "runtimes": { "aspnetcore": [ "$(MicrosoftAspNetCoreApp60Version)", From 93640ade5b0619ed053aadb171298ec033076a47 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 14 Jun 2024 09:13:31 -0700 Subject: [PATCH 247/568] Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20240613.1 (#6829) Microsoft.CodeAnalysis.NetAnalyzers From Version 9.0.0-preview.24306.2 -> To Version 9.0.0-preview.24313.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 21805324171..1e023a44791 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -18,9 +18,9 @@ - + https://github.com/dotnet/roslyn-analyzers - 4d5fd9da36d64d4c3370b8813122e226844fc6ed + 52913b28e20a224a5f6d56fe0b84b13210e274b0 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 5e06c93cef7..2c9db82a888 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -60,7 +60,7 @@ 8.0.0-preview.24307.1 8.0.0-preview.24307.1 - 9.0.0-preview.24306.2 + 9.0.0-preview.24313.1 9.0.0-preview.6.24307.2 9.0.0-preview.6.24307.2 From e00795e5cbae48e59ebcec25dba4faedca56ae44 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 14 Jun 2024 16:58:04 +0000 Subject: [PATCH 248/568] Update dependencies from https://github.com/dotnet/sdk build 20240613.50 (#6830) [feature/9.x] Update dependencies from dotnet/sdk --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1e023a44791..ef382458801 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,9 +54,9 @@ https://github.com/dotnet/aspnetcore 7f2dfb0020ff29ab57df31e910f2b2d5ef48bf82 - + https://github.com/dotnet/sdk - 3ed3bf67670c92e675313b43c5e733755e781b3d + 9199d0efd4e3ba0a3a2d847923fd36e3c0a145ba https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 2c9db82a888..c24d999dbae 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,7 +65,7 @@ 9.0.0-preview.6.24307.2 9.0.0-preview.6.24307.2 - 9.0.100-preview.6.24313.1 + 9.0.100-preview.6.24313.50 1.0.530701 From bdee539fc57286b71fc337105903ac199aaa61bd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 14 Jun 2024 17:13:09 +0000 Subject: [PATCH 249/568] [feature/9.x] Update dependencies from dotnet/arcade (#6815) [feature/9.x] Update dependencies from dotnet/arcade - Update async void tests - Remove timeout from non-async method --- eng/Version.Details.xml | 20 +++++++++---------- eng/Versions.props | 6 +++--- eng/common/cross/build-rootfs.sh | 13 ++++++++++-- eng/common/cross/riscv64/sources.list.noble | 11 ++++++++++ eng/common/post-build/nuget-validation.ps1 | 7 +++++++ eng/common/tools.sh | 4 ++-- global.json | 4 ++-- .../AzureBlobEgressProviderTests.cs | 2 +- .../TemplatesTests.cs | 5 +++-- 9 files changed, 50 insertions(+), 22 deletions(-) create mode 100644 eng/common/cross/riscv64/sources.list.noble diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ef382458801..71a60357cfc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,25 +22,25 @@ https://github.com/dotnet/roslyn-analyzers 52913b28e20a224a5f6d56fe0b84b13210e274b0 - + https://github.com/dotnet/arcade - 11f7d1ae1a87b5d8c469fa00f22a184d2f5d1319 + d20e5f76ae843c2f1fe3ba5d05ba3fbf4547e719 - + https://github.com/dotnet/arcade - 11f7d1ae1a87b5d8c469fa00f22a184d2f5d1319 + d20e5f76ae843c2f1fe3ba5d05ba3fbf4547e719 - + https://github.com/dotnet/arcade - 11f7d1ae1a87b5d8c469fa00f22a184d2f5d1319 + d20e5f76ae843c2f1fe3ba5d05ba3fbf4547e719 - + https://github.com/dotnet/arcade - 11f7d1ae1a87b5d8c469fa00f22a184d2f5d1319 + d20e5f76ae843c2f1fe3ba5d05ba3fbf4547e719 - + https://github.com/dotnet/arcade - 11f7d1ae1a87b5d8c469fa00f22a184d2f5d1319 + d20e5f76ae843c2f1fe3ba5d05ba3fbf4547e719 https://github.com/dotnet/diagnostics diff --git a/eng/Versions.props b/eng/Versions.props index c24d999dbae..2806b91502f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,9 +48,9 @@ --> - 9.0.0-beta.24311.1 - 9.0.0-beta.24311.1 - 9.0.0-beta.24311.1 + 9.0.0-beta.24313.4 + 9.0.0-beta.24313.4 + 9.0.0-beta.24313.4 9.0.0-preview.6.24309.2 9.0.0-preview.6.24309.2 diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index 7455dcb6af4..8bb233ba25b 100644 --- a/eng/common/cross/build-rootfs.sh +++ b/eng/common/cross/build-rootfs.sh @@ -131,6 +131,7 @@ __AlpineKeys=' __Keyring= __SkipSigCheck=0 __UseMirror=0 +__UseDeb822Format=0 __UnprocessedBuildArgs= while :; do @@ -181,7 +182,6 @@ while :; do __AlpinePackages="${__AlpinePackages// lldb-dev/}" __QEMUArch=riscv64 __UbuntuArch=riscv64 - __UbuntuRepo="http://deb.debian.org/debian" __UbuntuPackages="${__UbuntuPackages// libunwind8-dev/}" unset __LLDB_Package @@ -288,6 +288,12 @@ while :; do __CodeName=jammy fi ;; + noble) # Ubuntu 24.04 + if [[ "$__CodeName" != "jessie" ]]; then + __CodeName=noble + fi + __UseDeb822Format=1 + ;; jessie) # Debian 8 __CodeName=jessie @@ -732,8 +738,11 @@ elif [[ -n "$__CodeName" ]]; then fi # shellcheck disable=SC2086 + echo running debootstrap "--variant=minbase" $__Keyring --arch "$__UbuntuArch" "$__CodeName" "$__RootfsDir" "$__UbuntuRepo" debootstrap "--variant=minbase" $__Keyring --arch "$__UbuntuArch" "$__CodeName" "$__RootfsDir" "$__UbuntuRepo" - cp "$__CrossDir/$__BuildArch/sources.list.$__CodeName" "$__RootfsDir/etc/apt/sources.list" + mkdir -p "$__RootfsDir/etc/apt/sources.list.d/" + grep -q "Types:" "$__CrossDir/$__BuildArch/sources.list.$__CodeName" && filename="$__CodeName.sources" || filename="$__CodeName.list" + cp "$__CrossDir/$__BuildArch/sources.list.$__CodeName" "$__RootfsDir/etc/apt/sources.list.d/$filename" chroot "$__RootfsDir" apt-get update chroot "$__RootfsDir" apt-get -f -y install # shellcheck disable=SC2086 diff --git a/eng/common/cross/riscv64/sources.list.noble b/eng/common/cross/riscv64/sources.list.noble new file mode 100644 index 00000000000..4a5b56256da --- /dev/null +++ b/eng/common/cross/riscv64/sources.list.noble @@ -0,0 +1,11 @@ +Types: deb +URIs: http://ports.ubuntu.com/ubuntu-ports/ +Suites: noble noble-updates noble-backports +Components: main universe restricted multiverse +Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg + +Types: deb +URIs: http://ports.ubuntu.com/ubuntu-ports/ +Suites: noble-security +Components: main universe restricted multiverse +Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg diff --git a/eng/common/post-build/nuget-validation.ps1 b/eng/common/post-build/nuget-validation.ps1 index 9c81aa43917..e5de00c8983 100644 --- a/eng/common/post-build/nuget-validation.ps1 +++ b/eng/common/post-build/nuget-validation.ps1 @@ -5,6 +5,13 @@ param( [Parameter(Mandatory=$true)][string] $PackagesPath # Path to where the packages to be validated are ) +# `tools.ps1` checks $ci to perform some actions. Since the post-build +# scripts don't necessarily execute in the same agent that run the +# build.ps1/sh script this variable isn't automatically set. +$ci = $true +$disableConfigureToolsetImport = $true +. $PSScriptRoot\..\tools.ps1 + try { & $PSScriptRoot\nuget-verification.ps1 ${PackagesPath}\*.nupkg } diff --git a/eng/common/tools.sh b/eng/common/tools.sh index 5e4f910fc83..00473c9f918 100644 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -351,9 +351,9 @@ function InitializeBuildTool { function GetNuGetPackageCachePath { if [[ -z ${NUGET_PACKAGES:-} ]]; then if [[ "$use_global_nuget_cache" == true ]]; then - export NUGET_PACKAGES="$HOME/.nuget/packages" + export NUGET_PACKAGES="$HOME/.nuget/packages/" else - export NUGET_PACKAGES="$repo_root/.packages" + export NUGET_PACKAGES="$repo_root/.packages/" export RESTORENOHTTPCACHE=true fi fi diff --git a/global.json b/global.json index 17e91d612f9..3c22e832261 100644 --- a/global.json +++ b/global.json @@ -31,7 +31,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24311.1", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24311.1" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24313.4", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24313.4" } } diff --git a/src/Tests/Microsoft.Diagnostics.Monitoring.AzureBlobStorageTests.UnitTests/AzureBlobEgressProviderTests.cs b/src/Tests/Microsoft.Diagnostics.Monitoring.AzureBlobStorageTests.UnitTests/AzureBlobEgressProviderTests.cs index ecc99cce7e9..6636862dcee 100644 --- a/src/Tests/Microsoft.Diagnostics.Monitoring.AzureBlobStorageTests.UnitTests/AzureBlobEgressProviderTests.cs +++ b/src/Tests/Microsoft.Diagnostics.Monitoring.AzureBlobStorageTests.UnitTests/AzureBlobEgressProviderTests.cs @@ -234,7 +234,7 @@ public async Task AzureBlobEgress_DoesNotThrowWhen_QueueDoesNotExistAndUsingRest Assert.Empty(messages); } - [ConditionalFact(Timeout = EgressUnitTestTimeoutMs)] + [Fact] public void AzureBlobEgress_DefaultCredentials() { // These are auth methods we know about. If this test fails, it means a new auth method was added and we need to update the test. diff --git a/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.UnitTests/TemplatesTests.cs b/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.UnitTests/TemplatesTests.cs index cb6d2aa6742..307bedde981 100644 --- a/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.UnitTests/TemplatesTests.cs +++ b/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.UnitTests/TemplatesTests.cs @@ -15,6 +15,7 @@ using System.IO; using System.Linq; using System.Reflection; +using System.Threading.Tasks; using Xunit; using Xunit.Abstractions; @@ -39,7 +40,7 @@ public TemplatesTests(ITestOutputHelper outputHelper) /// Tests that Templates are correctly translated from JSON to CollectionRuleOptions. /// [Fact] - public async void TemplatesTranslationSuccessTest() + public async Task TemplatesTranslationSuccessTest() { using TemporaryDirectory userConfigDir = new(_outputHelper); @@ -84,7 +85,7 @@ await TestHostHelper.CreateCollectionRulesHost(_outputHelper, rootOptions => { } /// Tests that incorrectly referenced Templates error correctly. /// [Fact] - public async void TemplatesTranslationFailTest() + public async Task TemplatesTranslationFailTest() { using TemporaryDirectory userConfigDir = new(_outputHelper); From e144a413348274b7afc0323eab08c3d4f319e0ce Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 14 Jun 2024 21:25:28 +0000 Subject: [PATCH 250/568] Restore branch-specific files --- .../job/source-index-stage1.yml | 74 ++----------------- .../templates/job/source-index-stage1.yml | 57 +------------- 2 files changed, 7 insertions(+), 124 deletions(-) diff --git a/eng/common/templates-official/job/source-index-stage1.yml b/eng/common/templates-official/job/source-index-stage1.yml index 7f362c005e9..6d5ead316f9 100644 --- a/eng/common/templates-official/job/source-index-stage1.yml +++ b/eng/common/templates-official/job/source-index-stage1.yml @@ -1,71 +1,7 @@ jobs: -- job: SourceIndexStage1 - dependsOn: ${{ parameters.dependsOn }} - condition: ${{ parameters.condition }} - variables: - - name: SourceIndexUploadPackageVersion - value: ${{ parameters.sourceIndexUploadPackageVersion }} - - name: SourceIndexProcessBinlogPackageVersion - value: ${{ parameters.sourceIndexProcessBinlogPackageVersion }} - - name: SourceIndexPackageSource - value: ${{ parameters.sourceIndexPackageSource }} - - name: BinlogPath - value: ${{ parameters.binlogPath }} - - template: /eng/common/templates-official/variables/pool-providers.yml +- template: /eng/common/core-templates/job/source-index-stage1.yml + parameters: + is1ESPipeline: true - ${{ if ne(parameters.pool, '') }}: - pool: ${{ parameters.pool }} - ${{ if eq(parameters.pool, '') }}: - pool: - ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: $(DncEngPublicBuildPool) - demands: ImageOverride -equals windows.vs2019.amd64.open - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: $(DncEngInternalBuildPool) - image: windows.vs2022.amd64 - os: windows - - steps: - - ${{ each preStep in parameters.preSteps }}: - - ${{ preStep }} - - - task: UseDotNet@2 - displayName: Use .NET 8 SDK - inputs: - packageType: sdk - version: 8.0.x - installationPath: $(Agent.TempDirectory)/dotnet - workingDirectory: $(Agent.TempDirectory) - - - script: | - $(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version $(sourceIndexProcessBinlogPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools - $(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version $(sourceIndexUploadPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools - displayName: Download Tools - # Set working directory to temp directory so 'dotnet' doesn't try to use global.json and use the repo's sdk. - workingDirectory: $(Agent.TempDirectory) - - - script: ${{ parameters.sourceIndexBuildCommand }} - displayName: Build Repository - - - script: $(Agent.TempDirectory)/.source-index/tools/BinLogToSln -i $(BinlogPath) -r $(Build.SourcesDirectory) -n $(Build.Repository.Name) -o .source-index/stage1output - displayName: Process Binlog into indexable sln - - - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - task: AzureCLI@2 - displayName: Get stage 1 auth token - inputs: - azureSubscription: 'SourceDotNet Stage1 Publish' - addSpnToEnvironment: true - scriptType: 'ps' - scriptLocation: 'inlineScript' - inlineScript: | - echo "##vso[task.setvariable variable=ARM_CLIENT_ID;issecret=true]$env:servicePrincipalId" - echo "##vso[task.setvariable variable=ARM_ID_TOKEN;issecret=true]$env:idToken" - echo "##vso[task.setvariable variable=ARM_TENANT_ID;issecret=true]$env:tenantId" - - - script: | - az login --service-principal -u $(ARM_CLIENT_ID) --tenant $(ARM_TENANT_ID) --allow-no-subscriptions --federated-token $(ARM_ID_TOKEN) - displayName: "Login to Azure" - - - script: $(Agent.TempDirectory)/.source-index/tools/UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name) -s netsourceindexstage1 -b stage1 - displayName: Upload stage1 artifacts to source index + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/eng/common/templates/job/source-index-stage1.yml b/eng/common/templates/job/source-index-stage1.yml index b31f24f0ff3..89f3291593c 100644 --- a/eng/common/templates/job/source-index-stage1.yml +++ b/eng/common/templates/job/source-index-stage1.yml @@ -3,58 +3,5 @@ jobs: parameters: is1ESPipeline: false - ${{ if ne(parameters.pool, '') }}: - pool: ${{ parameters.pool }} - ${{ if eq(parameters.pool, '') }}: - pool: - ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: $(DncEngPublicBuildPool) - demands: ImageOverride -equals windows.vs2019.amd64.open - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: $(DncEngInternalBuildPool) - demands: ImageOverride -equals windows.vs2019.amd64 - - steps: - - ${{ each preStep in parameters.preSteps }}: - - ${{ preStep }} - - - task: UseDotNet@2 - displayName: Use .NET 8 SDK - inputs: - packageType: sdk - version: 8.0.x - installationPath: $(Agent.TempDirectory)/dotnet - workingDirectory: $(Agent.TempDirectory) - - - script: | - $(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version $(sourceIndexProcessBinlogPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools - $(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version $(sourceIndexUploadPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools - displayName: Download Tools - # Set working directory to temp directory so 'dotnet' doesn't try to use global.json and use the repo's sdk. - workingDirectory: $(Agent.TempDirectory) - - - script: ${{ parameters.sourceIndexBuildCommand }} - displayName: Build Repository - - - script: $(Agent.TempDirectory)/.source-index/tools/BinLogToSln -i $(BinlogPath) -r $(Build.SourcesDirectory) -n $(Build.Repository.Name) -o .source-index/stage1output - displayName: Process Binlog into indexable sln - - - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - task: AzureCLI@2 - displayName: Get stage 1 auth token - inputs: - azureSubscription: 'SourceDotNet Stage1 Publish' - addSpnToEnvironment: true - scriptType: 'ps' - scriptLocation: 'inlineScript' - inlineScript: | - echo "##vso[task.setvariable variable=ARM_CLIENT_ID;issecret=true]$env:servicePrincipalId" - echo "##vso[task.setvariable variable=ARM_ID_TOKEN;issecret=true]$env:idToken" - echo "##vso[task.setvariable variable=ARM_TENANT_ID;issecret=true]$env:tenantId" - - - script: | - az login --service-principal -u $(ARM_CLIENT_ID) --tenant $(ARM_TENANT_ID) --allow-no-subscriptions --federated-token $(ARM_ID_TOKEN) - displayName: "Login to Azure" - - - script: $(Agent.TempDirectory)/.source-index/tools/UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name) -s netsourceindexstage1 -b stage1 - displayName: Upload stage1 artifacts to source index + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} From 503870a078c3e363b958fd56200056e1b184a3e1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 15 Jun 2024 14:09:24 +0000 Subject: [PATCH 251/568] Update dependencies from https://github.com/dotnet/sdk build 20240614.10 (#6841) [feature/9.x] Update dependencies from dotnet/sdk --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 71a60357cfc..49a274c1463 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,9 +54,9 @@ https://github.com/dotnet/aspnetcore 7f2dfb0020ff29ab57df31e910f2b2d5ef48bf82 - + https://github.com/dotnet/sdk - 9199d0efd4e3ba0a3a2d847923fd36e3c0a145ba + 60e06cc3059bd58e88ec62c878d256ad25b6d568 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 2806b91502f..12b016c5532 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,7 +65,7 @@ 9.0.0-preview.6.24307.2 9.0.0-preview.6.24307.2 - 9.0.100-preview.6.24313.50 + 9.0.100-preview.6.24314.10 1.0.530701 From 618e604fbd4a3bd38c1fd6c1ed7c3eaba72432cc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 16 Jun 2024 13:43:51 +0000 Subject: [PATCH 252/568] [feature/9.x] Update dependencies from dotnet/arcade (#6840) [feature/9.x] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- global.json | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 49a274c1463..9dbc20bc517 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,25 +22,25 @@ https://github.com/dotnet/roslyn-analyzers 52913b28e20a224a5f6d56fe0b84b13210e274b0 - + https://github.com/dotnet/arcade - d20e5f76ae843c2f1fe3ba5d05ba3fbf4547e719 + 92a725aa4d9d6c13dc5229597b51b0b165b8b535 - + https://github.com/dotnet/arcade - d20e5f76ae843c2f1fe3ba5d05ba3fbf4547e719 + 92a725aa4d9d6c13dc5229597b51b0b165b8b535 - + https://github.com/dotnet/arcade - d20e5f76ae843c2f1fe3ba5d05ba3fbf4547e719 + 92a725aa4d9d6c13dc5229597b51b0b165b8b535 - + https://github.com/dotnet/arcade - d20e5f76ae843c2f1fe3ba5d05ba3fbf4547e719 + 92a725aa4d9d6c13dc5229597b51b0b165b8b535 - + https://github.com/dotnet/arcade - d20e5f76ae843c2f1fe3ba5d05ba3fbf4547e719 + 92a725aa4d9d6c13dc5229597b51b0b165b8b535 https://github.com/dotnet/diagnostics diff --git a/eng/Versions.props b/eng/Versions.props index 12b016c5532..56e1d69ce3e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,9 +48,9 @@ --> - 9.0.0-beta.24313.4 - 9.0.0-beta.24313.4 - 9.0.0-beta.24313.4 + 9.0.0-beta.24314.1 + 9.0.0-beta.24314.1 + 9.0.0-beta.24314.1 9.0.0-preview.6.24309.2 9.0.0-preview.6.24309.2 diff --git a/global.json b/global.json index 3c22e832261..728f1bb1e80 100644 --- a/global.json +++ b/global.json @@ -31,7 +31,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24313.4", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24313.4" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24314.1", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24314.1" } } From e9208350636db5e94c673fb2455079109351651f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 17 Jun 2024 14:43:40 +0000 Subject: [PATCH 253/568] Update dependencies from https://github.com/dotnet/sdk build 20240616.4 (#6843) [feature/9.x] Update dependencies from dotnet/sdk --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9dbc20bc517..b00aba540da 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,9 +54,9 @@ https://github.com/dotnet/aspnetcore 7f2dfb0020ff29ab57df31e910f2b2d5ef48bf82 - + https://github.com/dotnet/sdk - 60e06cc3059bd58e88ec62c878d256ad25b6d568 + 62a0d68796cc8253e2d8b13b4a0391640f3d6cdc https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 56e1d69ce3e..ef34a1f089d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,7 +65,7 @@ 9.0.0-preview.6.24307.2 9.0.0-preview.6.24307.2 - 9.0.100-preview.6.24314.10 + 9.0.100-preview.6.24316.4 1.0.530701 From d01cb1d15321aded75985f58933542d36a6b3807 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 18 Jun 2024 14:10:12 +0000 Subject: [PATCH 254/568] Update dependencies from https://github.com/dotnet/arcade build 20240617.3 (#6848) [feature/9.x] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- global.json | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b00aba540da..71ab55a8050 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,25 +22,25 @@ https://github.com/dotnet/roslyn-analyzers 52913b28e20a224a5f6d56fe0b84b13210e274b0 - + https://github.com/dotnet/arcade - 92a725aa4d9d6c13dc5229597b51b0b165b8b535 + 579b9d3c2a51de22be7685f0bd624bf83265c901 - + https://github.com/dotnet/arcade - 92a725aa4d9d6c13dc5229597b51b0b165b8b535 + 579b9d3c2a51de22be7685f0bd624bf83265c901 - + https://github.com/dotnet/arcade - 92a725aa4d9d6c13dc5229597b51b0b165b8b535 + 579b9d3c2a51de22be7685f0bd624bf83265c901 - + https://github.com/dotnet/arcade - 92a725aa4d9d6c13dc5229597b51b0b165b8b535 + 579b9d3c2a51de22be7685f0bd624bf83265c901 - + https://github.com/dotnet/arcade - 92a725aa4d9d6c13dc5229597b51b0b165b8b535 + 579b9d3c2a51de22be7685f0bd624bf83265c901 https://github.com/dotnet/diagnostics diff --git a/eng/Versions.props b/eng/Versions.props index ef34a1f089d..9bf8c27d201 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,9 +48,9 @@ --> - 9.0.0-beta.24314.1 - 9.0.0-beta.24314.1 - 9.0.0-beta.24314.1 + 9.0.0-beta.24317.3 + 9.0.0-beta.24317.3 + 9.0.0-beta.24317.3 9.0.0-preview.6.24309.2 9.0.0-preview.6.24309.2 diff --git a/global.json b/global.json index 728f1bb1e80..7ecae4f5df8 100644 --- a/global.json +++ b/global.json @@ -31,7 +31,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24314.1", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24314.1" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24317.3", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24317.3" } } From ac811c92b925aaac7edd461b76d1c2425223a14b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 18 Jun 2024 14:11:25 +0000 Subject: [PATCH 255/568] Update dependencies from https://github.com/dotnet/sdk build 20240617.13 (#6849) [feature/9.x] Update dependencies from dotnet/sdk --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 71ab55a8050..0fc728de442 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,9 +54,9 @@ https://github.com/dotnet/aspnetcore 7f2dfb0020ff29ab57df31e910f2b2d5ef48bf82 - + https://github.com/dotnet/sdk - 62a0d68796cc8253e2d8b13b4a0391640f3d6cdc + 5e7c92b9dff9720c2239ea7444571478e0604682 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 9bf8c27d201..4bd1444b52c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,7 +65,7 @@ 9.0.0-preview.6.24307.2 9.0.0-preview.6.24307.2 - 9.0.100-preview.6.24316.4 + 9.0.100-preview.6.24317.13 1.0.530701 From 2ba187f83d71f451ce46727184c7e913ed4b93ce Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 19 Jun 2024 13:36:28 +0000 Subject: [PATCH 256/568] Update dependencies from https://github.com/dotnet/diagnostics build 20240618.2 (#6857) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0fc728de442..1f6d3bb3130 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore 7f2dfb0020ff29ab57df31e910f2b2d5ef48bf82 - + https://github.com/dotnet/diagnostics - 33d8bf23a6566cd3fb9055acfc9f1141391d5421 + d592e0da173e520ef42d4f9cdd9d7b138a9896fd - + https://github.com/dotnet/diagnostics - 33d8bf23a6566cd3fb9055acfc9f1141391d5421 + d592e0da173e520ef42d4f9cdd9d7b138a9896fd https://github.com/dotnet/command-line-api @@ -42,9 +42,9 @@ https://github.com/dotnet/arcade 579b9d3c2a51de22be7685f0bd624bf83265c901 - + https://github.com/dotnet/diagnostics - 33d8bf23a6566cd3fb9055acfc9f1141391d5421 + d592e0da173e520ef42d4f9cdd9d7b138a9896fd https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 4bd1444b52c..442c45b59b5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24209.3 - 8.0.0-preview.24307.1 - 8.0.0-preview.24307.1 + 8.0.0-preview.24318.2 + 8.0.0-preview.24318.2 9.0.0-preview.24313.1 @@ -67,7 +67,7 @@ 9.0.100-preview.6.24317.13 - 1.0.530701 + 1.0.531802 $(MicrosoftNETCoreApp31Version) From a5acb329ed60076ad00c234dac4f5bf897e8761f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 19 Jun 2024 13:45:40 +0000 Subject: [PATCH 257/568] Update dependencies from https://github.com/dotnet/sdk build 20240619.2 (#6859) [feature/9.x] Update dependencies from dotnet/sdk --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1f6d3bb3130..761ae668caa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,9 +54,9 @@ https://github.com/dotnet/aspnetcore 7f2dfb0020ff29ab57df31e910f2b2d5ef48bf82 - + https://github.com/dotnet/sdk - 5e7c92b9dff9720c2239ea7444571478e0604682 + fda398e8bc6abf3ee455500c7f189db6f6800180 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 442c45b59b5..2ab9b87d3d1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,7 +65,7 @@ 9.0.0-preview.6.24307.2 9.0.0-preview.6.24307.2 - 9.0.100-preview.6.24317.13 + 9.0.100-preview.6.24319.2 1.0.531802 From 94666feff8d4d246f62d885b1cf2f9bb8c972eeb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 19 Jun 2024 09:25:06 -0700 Subject: [PATCH 258/568] Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20240618.1 (#6858) Microsoft.CodeAnalysis.NetAnalyzers From Version 9.0.0-preview.24313.1 -> To Version 9.0.0-preview.24318.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 761ae668caa..17c1f7708d7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -18,9 +18,9 @@ - + https://github.com/dotnet/roslyn-analyzers - 52913b28e20a224a5f6d56fe0b84b13210e274b0 + f1115edce8633ebe03a86191bc05c6969ed9a821 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 2ab9b87d3d1..e606911f942 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -60,7 +60,7 @@ 8.0.0-preview.24318.2 8.0.0-preview.24318.2 - 9.0.0-preview.24313.1 + 9.0.0-preview.24318.1 9.0.0-preview.6.24307.2 9.0.0-preview.6.24307.2 From 221132625266ed81f04596d3bd04d26640ff7e1c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 20 Jun 2024 13:43:35 +0000 Subject: [PATCH 259/568] Update dependencies from https://github.com/dotnet/diagnostics build 20240619.2 (#6861) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 6 +++--- eng/Versions.props | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 17c1f7708d7..33d2d12a2a6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,11 +4,11 @@ https://github.com/dotnet/aspnetcore 7f2dfb0020ff29ab57df31e910f2b2d5ef48bf82 - + https://github.com/dotnet/diagnostics d592e0da173e520ef42d4f9cdd9d7b138a9896fd - + https://github.com/dotnet/diagnostics d592e0da173e520ef42d4f9cdd9d7b138a9896fd @@ -42,7 +42,7 @@ https://github.com/dotnet/arcade 579b9d3c2a51de22be7685f0bd624bf83265c901 - + https://github.com/dotnet/diagnostics d592e0da173e520ef42d4f9cdd9d7b138a9896fd diff --git a/eng/Versions.props b/eng/Versions.props index e606911f942..d1582bd9e85 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24209.3 - 8.0.0-preview.24318.2 - 8.0.0-preview.24318.2 + 8.0.0-preview.24319.2 + 8.0.0-preview.24319.2 9.0.0-preview.24318.1 @@ -67,7 +67,7 @@ 9.0.100-preview.6.24319.2 - 1.0.531802 + 1.0.531902 $(MicrosoftNETCoreApp31Version) From f73e906fcecc046f33f061ec7442152e2fb4ad48 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 20 Jun 2024 13:51:30 +0000 Subject: [PATCH 260/568] Update dependencies from https://github.com/dotnet/sdk build 20240619.5 (#6862) [feature/9.x] Update dependencies from dotnet/sdk --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 33d2d12a2a6..a7de48542a8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,9 +54,9 @@ https://github.com/dotnet/aspnetcore 7f2dfb0020ff29ab57df31e910f2b2d5ef48bf82 - + https://github.com/dotnet/sdk - fda398e8bc6abf3ee455500c7f189db6f6800180 + f3ebfb5ccb1ca3b072cee5b8f52a9e1087b2ad11 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index d1582bd9e85..ef30ed14727 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,7 +65,7 @@ 9.0.0-preview.6.24307.2 9.0.0-preview.6.24307.2 - 9.0.100-preview.6.24319.2 + 9.0.100-preview.6.24319.5 1.0.531902 From ca43eb7b249551ca4d08d46320e9cd9a6bcad51f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 21 Jun 2024 14:01:40 +0000 Subject: [PATCH 261/568] Update dependencies from https://github.com/dotnet/diagnostics build 20240620.2 (#6867) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a7de48542a8..420eeed6689 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore 7f2dfb0020ff29ab57df31e910f2b2d5ef48bf82 - + https://github.com/dotnet/diagnostics - d592e0da173e520ef42d4f9cdd9d7b138a9896fd + 464e06c9a8602dff44ff5c59e9a0c3777f68e41c - + https://github.com/dotnet/diagnostics - d592e0da173e520ef42d4f9cdd9d7b138a9896fd + 464e06c9a8602dff44ff5c59e9a0c3777f68e41c https://github.com/dotnet/command-line-api @@ -42,9 +42,9 @@ https://github.com/dotnet/arcade 579b9d3c2a51de22be7685f0bd624bf83265c901 - + https://github.com/dotnet/diagnostics - d592e0da173e520ef42d4f9cdd9d7b138a9896fd + 464e06c9a8602dff44ff5c59e9a0c3777f68e41c https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index ef30ed14727..4db79e29f2b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24209.3 - 8.0.0-preview.24319.2 - 8.0.0-preview.24319.2 + 8.0.0-preview.24320.2 + 8.0.0-preview.24320.2 9.0.0-preview.24318.1 @@ -67,7 +67,7 @@ 9.0.100-preview.6.24319.5 - 1.0.531902 + 1.0.532002 $(MicrosoftNETCoreApp31Version) From 5f5f3b33654bec60d555f83b7893585ad1f851e1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 21 Jun 2024 14:05:39 +0000 Subject: [PATCH 262/568] Update dependencies from https://github.com/dotnet/arcade build 20240620.6 (#6868) [feature/9.x] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 +-- eng/Versions.props | 6 +- eng/common/SetupNugetSources.ps1 | 143 ++++++++++-------- eng/common/SetupNugetSources.sh | 2 +- .../steps/enable-internal-sources.yml | 46 +++--- global.json | 4 +- 6 files changed, 126 insertions(+), 95 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 420eeed6689..282e92983fd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,25 +22,25 @@ https://github.com/dotnet/roslyn-analyzers f1115edce8633ebe03a86191bc05c6969ed9a821 - + https://github.com/dotnet/arcade - 579b9d3c2a51de22be7685f0bd624bf83265c901 + bfd4f951527e37d08f16f5cff09173943061601e - + https://github.com/dotnet/arcade - 579b9d3c2a51de22be7685f0bd624bf83265c901 + bfd4f951527e37d08f16f5cff09173943061601e - + https://github.com/dotnet/arcade - 579b9d3c2a51de22be7685f0bd624bf83265c901 + bfd4f951527e37d08f16f5cff09173943061601e - + https://github.com/dotnet/arcade - 579b9d3c2a51de22be7685f0bd624bf83265c901 + bfd4f951527e37d08f16f5cff09173943061601e - + https://github.com/dotnet/arcade - 579b9d3c2a51de22be7685f0bd624bf83265c901 + bfd4f951527e37d08f16f5cff09173943061601e https://github.com/dotnet/diagnostics diff --git a/eng/Versions.props b/eng/Versions.props index 4db79e29f2b..9cf30c383b6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,9 +48,9 @@ --> - 9.0.0-beta.24317.3 - 9.0.0-beta.24317.3 - 9.0.0-beta.24317.3 + 9.0.0-beta.24320.6 + 9.0.0-beta.24320.6 + 9.0.0-beta.24320.6 9.0.0-preview.6.24309.2 9.0.0-preview.6.24309.2 diff --git a/eng/common/SetupNugetSources.ps1 b/eng/common/SetupNugetSources.ps1 index c07f6a52601..2b0a5c9e665 100644 --- a/eng/common/SetupNugetSources.ps1 +++ b/eng/common/SetupNugetSources.ps1 @@ -1,32 +1,31 @@ # This script adds internal feeds required to build commits that depend on internal package sources. For instance, # dotnet6-internal would be added automatically if dotnet6 was found in the nuget.config file. In addition also enables # disabled internal Maestro (darc-int*) feeds. -# -# Optionally, this script also adds a credential entry for each of the internal feeds if supplied. This credential -# is added via the standard environment variable VSS_NUGET_EXTERNAL_FEED_ENDPOINTS. See -# https://github.com/microsoft/artifacts-credprovider/tree/v1.1.1?tab=readme-ov-file#environment-variables for more details +# +# Optionally, this script also adds a credential entry for each of the internal feeds if supplied. # # See example call for this script below. # # - task: PowerShell@2 -# displayName: Setup Internal Feeds +# displayName: Setup Private Feeds Credentials # condition: eq(variables['Agent.OS'], 'Windows_NT') # inputs: # filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 -# arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -# - task: NuGetAuthenticate@1 -# +# arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token +# env: +# Token: $(dn-bot-dnceng-artifact-feeds-rw) +# # Note that the NuGetAuthenticate task should be called after SetupNugetSources. # This ensures that: # - Appropriate creds are set for the added internal feeds (if not supplied to the scrupt) -# - The credential provider is installed +# - The credential provider is installed. # # This logic is also abstracted into enable-internal-sources.yml. [CmdletBinding()] param ( [Parameter(Mandatory = $true)][string]$ConfigFile, - [string]$Password + $Password ) $ErrorActionPreference = "Stop" @@ -35,23 +34,12 @@ Set-StrictMode -Version 2.0 . $PSScriptRoot\tools.ps1 -$feedEndpoints = $null - -# If a credential is provided, ensure that we don't overwrite the current set of -# credentials that may have been provided by a previous call to the credential provider. -if ($Password -and $null -ne $env:VSS_NUGET_EXTERNAL_FEED_ENDPOINTS) { - $feedEndpoints = $env:VSS_NUGET_EXTERNAL_FEED_ENDPOINTS | ConvertFrom-Json -} elseif ($Password) { - $feedEndpoints = @{ endpointCredentials = @() } -} - # Add source entry to PackageSources -function AddPackageSource($sources, $SourceName, $SourceEndPoint, $pwd) { +function AddPackageSource($sources, $SourceName, $SourceEndPoint, $creds, $Username, $pwd) { $packageSource = $sources.SelectSingleNode("add[@key='$SourceName']") - if ($null -eq $packageSource) + if ($packageSource -eq $null) { - Write-Host "`tAdding package source" $SourceName $packageSource = $doc.CreateElement("add") $packageSource.SetAttribute("key", $SourceName) $packageSource.SetAttribute("value", $SourceEndPoint) @@ -61,33 +49,63 @@ function AddPackageSource($sources, $SourceName, $SourceEndPoint, $pwd) { Write-Host "Package source $SourceName already present." } - if ($pwd) { - $feedEndpoints.endpointCredentials = AddCredential -endpointCredentials $feedEndpoints.endpointCredentials -source $SourceEndPoint -pwd $pwd - } + AddCredential -Creds $creds -Source $SourceName -Username $Username -pwd $pwd } -# Add a new feed endpoint credential -function AddCredential([array]$endpointCredentials, $source, $pwd) { - $endpointCredentials += @{ - endpoint = $source; - password = $pwd +# Add a credential node for the specified source +function AddCredential($creds, $source, $username, $pwd) { + # If no cred supplied, don't do anything. + if (!$pwd) { + return; } - return $endpointCredentials + + # Looks for credential configuration for the given SourceName. Create it if none is found. + $sourceElement = $creds.SelectSingleNode($Source) + if ($sourceElement -eq $null) + { + $sourceElement = $doc.CreateElement($Source) + $creds.AppendChild($sourceElement) | Out-Null + } + + # Add the node to the credential if none is found. + $usernameElement = $sourceElement.SelectSingleNode("add[@key='Username']") + if ($usernameElement -eq $null) + { + $usernameElement = $doc.CreateElement("add") + $usernameElement.SetAttribute("key", "Username") + $sourceElement.AppendChild($usernameElement) | Out-Null + } + $usernameElement.SetAttribute("value", $Username) + + # Add the to the credential if none is found. + # Add it as a clear text because there is no support for encrypted ones in non-windows .Net SDKs. + # -> https://github.com/NuGet/Home/issues/5526 + $passwordElement = $sourceElement.SelectSingleNode("add[@key='ClearTextPassword']") + if ($passwordElement -eq $null) + { + $passwordElement = $doc.CreateElement("add") + $passwordElement.SetAttribute("key", "ClearTextPassword") + $sourceElement.AppendChild($passwordElement) | Out-Null + } + + $passwordElement.SetAttribute("value", $pwd) } -function InsertMaestroInternalFeedCredentials($Sources, $pwd) { - $maestroInternalSources = $Sources.SelectNodes("add[contains(@key,'darc-int')]") +function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Username, $pwd) { + $maestroPrivateSources = $Sources.SelectNodes("add[contains(@key,'darc-int')]") - ForEach ($PackageSource in $maestroInternalSources) { - Write-Host "`tAdding credential for Maestro's feed:" $PackageSource.Key - $feedEndpoints.endpointCredentials = AddCredential -endpointCredentials $feedEndpoints.endpointCredentials -source $PackageSource.value -pwd $pwd + Write-Host "Inserting credentials for $($maestroPrivateSources.Count) Maestro's private feeds." + + ForEach ($PackageSource in $maestroPrivateSources) { + Write-Host "`tInserting credential for Maestro's feed:" $PackageSource.Key + AddCredential -Creds $creds -Source $PackageSource.Key -Username $Username -pwd $pwd } } -function EnableInternalPackageSources($DisabledPackageSources) { - $maestroInternalSources = $DisabledPackageSources.SelectNodes("add[contains(@key,'darc-int')]") - ForEach ($DisabledPackageSource in $maestroInternalSources) { - Write-Host "`tEnsuring internal source '$($DisabledPackageSource.key)' is enabled by deleting it from disabledPackageSource" +function EnablePrivatePackageSources($DisabledPackageSources) { + $maestroPrivateSources = $DisabledPackageSources.SelectNodes("add[contains(@key,'darc-int')]") + ForEach ($DisabledPackageSource in $maestroPrivateSources) { + Write-Host "`tEnsuring private source '$($DisabledPackageSource.key)' is enabled by deleting it from disabledPackageSource" # Due to https://github.com/NuGet/Home/issues/10291, we must actually remove the disabled entries $DisabledPackageSources.RemoveChild($DisabledPackageSource) } @@ -105,27 +123,38 @@ $doc.Load($filename) # Get reference to or create one if none exist already $sources = $doc.DocumentElement.SelectSingleNode("packageSources") -if ($null -eq $sources) { +if ($sources -eq $null) { $sources = $doc.CreateElement("packageSources") $doc.DocumentElement.AppendChild($sources) | Out-Null } +$creds = $null +if ($Password) { + # Looks for a node. Create it if none is found. + $creds = $doc.DocumentElement.SelectSingleNode("packageSourceCredentials") + if ($creds -eq $null) { + $creds = $doc.CreateElement("packageSourceCredentials") + $doc.DocumentElement.AppendChild($creds) | Out-Null + } +} + # Check for disabledPackageSources; we'll enable any darc-int ones we find there $disabledSources = $doc.DocumentElement.SelectSingleNode("disabledPackageSources") -if ($null -ne $disabledSources) { +if ($disabledSources -ne $null) { Write-Host "Checking for any darc-int disabled package sources in the disabledPackageSources node" - EnableInternalPackageSources -DisabledPackageSources $disabledSources + EnablePrivatePackageSources -DisabledPackageSources $disabledSources } -if ($Password) { - InsertMaestroInternalFeedCredentials -Sources $sources -pwd $Password -} +$userName = "dn-bot" + +# Insert credential nodes for Maestro's private feeds +InsertMaestroPrivateFeedCredentials -Sources $sources -Creds $creds -Username $userName -pwd $Password # 3.1 uses a different feed url format so it's handled differently here $dotnet31Source = $sources.SelectSingleNode("add[@key='dotnet3.1']") -if ($null -ne $dotnet31Source) { - AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v3/index.json" -pwd $Password - AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v3/index.json" -pwd $Password +if ($dotnet31Source -ne $null) { + AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v2" -Creds $creds -Username $userName -pwd $Password + AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2" -Creds $creds -Username $userName -pwd $Password } $dotnetVersions = @('5','6','7','8') @@ -133,18 +162,10 @@ $dotnetVersions = @('5','6','7','8') foreach ($dotnetVersion in $dotnetVersions) { $feedPrefix = "dotnet" + $dotnetVersion; $dotnetSource = $sources.SelectSingleNode("add[@key='$feedPrefix']") - if ($dotnetSource) { - AddPackageSource -Sources $sources -SourceName "$feedPrefix-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedprefix-internal/nuget/v3/index.json" -pwd $Password - AddPackageSource -Sources $sources -SourceName "$feedPrefix-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal-transport/nuget/v3/index.json" -pwd $Password + if ($dotnetSource -ne $null) { + AddPackageSource -Sources $sources -SourceName "$feedPrefix-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal/nuget/v2" -Creds $creds -Username $userName -pwd $Password + AddPackageSource -Sources $sources -SourceName "$feedPrefix-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal-transport/nuget/v2" -Creds $creds -Username $userName -pwd $Password } } $doc.Save($filename) - -# If any credentials were added or altered, update the VSS_NUGET_EXTERNAL_FEED_ENDPOINTS environment variable -if ($null -ne $feedEndpoints) { - # ci is set to true so vso logging commands will be used. - $ci = $true - Write-PipelineSetVariable -Name 'VSS_NUGET_EXTERNAL_FEED_ENDPOINTS' -Value $($feedEndpoints | ConvertTo-Json) -IsMultiJobVariable $false - Write-PipelineSetVariable -Name 'NUGET_CREDENTIALPROVIDER_SESSIONTOKENCACHE_ENABLED' -Value "False" -IsMultiJobVariable $false -} \ No newline at end of file diff --git a/eng/common/SetupNugetSources.sh b/eng/common/SetupNugetSources.sh index 16c1e29ea3b..b493479a1da 100644 --- a/eng/common/SetupNugetSources.sh +++ b/eng/common/SetupNugetSources.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -# This script adds internal feeds required to build commits that depend on intenral package sources. For instance, +# This script adds internal feeds required to build commits that depend on internal package sources. For instance, # dotnet6-internal would be added automatically if dotnet6 was found in the nuget.config file. In addition also enables # disabled internal Maestro (darc-int*) feeds. # diff --git a/eng/common/core-templates/steps/enable-internal-sources.yml b/eng/common/core-templates/steps/enable-internal-sources.yml index 80deddafb1b..4a06b529082 100644 --- a/eng/common/core-templates/steps/enable-internal-sources.yml +++ b/eng/common/core-templates/steps/enable-internal-sources.yml @@ -6,30 +6,40 @@ parameters: - name: is1ESPipeline type: boolean default: false +# Legacy parameters to allow for PAT usage +- name: legacyCredential + type: string + default: '' steps: - ${{ if ne(variables['System.TeamProject'], 'public') }}: - # If running on dnceng (internal project), just use the default behavior for NuGetAuthenticate. - # If running on DevDiv, NuGetAuthenticate is not really an option. It's scoped to a single feed, and we have many feeds that - # may be added. Instead, we'll use the traditional approach (add cred to nuget.config), but use an account token. - - ${{ if eq(variables['System.TeamProject'], 'internal') }}: + - ${{ if ne(parameters.legacyCredential, '') }}: - task: PowerShell@2 displayName: Setup Internal Feeds inputs: filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config - - task: NuGetAuthenticate@1 + # If running on dnceng (internal project), just use the default behavior for NuGetAuthenticate. + # If running on DevDiv, NuGetAuthenticate is not really an option. It's scoped to a single feed, and we have many feeds that + # may be added. Instead, we'll use the traditional approach (add cred to nuget.config), but use an account token. - ${{ else }}: - - template: /eng/common/templates/steps/get-federated-access-token.yml - parameters: - federatedServiceConnection: ${{ parameters.nugetFederatedServiceConnection }} - outputVariableName: 'dnceng-artifacts-feeds-read-access-token' - - task: PowerShell@2 - displayName: Setup Internal Feeds - inputs: - filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 - arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $(dnceng-artifacts-feeds-read-access-token) - # This is required in certain scenarios to install the ADO credential provider. - # It installed by default in some msbuild invocations (e.g. VS msbuild), but needs to be installed for others - # (e.g. dotnet msbuild). - - task: NuGetAuthenticate@1 + - ${{ if eq(variables['System.TeamProject'], 'internal') }}: + - task: PowerShell@2 + displayName: Setup Internal Feeds + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 + arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config + - ${{ else }}: + - template: /eng/common/templates/steps/get-federated-access-token.yml + parameters: + federatedServiceConnection: ${{ parameters.nugetFederatedServiceConnection }} + outputVariableName: 'dnceng-artifacts-feeds-read-access-token' + - task: PowerShell@2 + displayName: Setup Internal Feeds + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 + arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $(dnceng-artifacts-feeds-read-access-token) + # This is required in certain scenarios to install the ADO credential provider. + # It installed by default in some msbuild invocations (e.g. VS msbuild), but needs to be installed for others + # (e.g. dotnet msbuild). + - task: NuGetAuthenticate@1 diff --git a/global.json b/global.json index 7ecae4f5df8..9844c4edeb7 100644 --- a/global.json +++ b/global.json @@ -31,7 +31,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24317.3", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24317.3" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24320.6", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24320.6" } } From 2fd73054d81bbb1a6ec28b9d4396cc6f04c27663 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 21 Jun 2024 14:11:33 +0000 Subject: [PATCH 263/568] Update dependencies from https://github.com/dotnet/sdk build 20240621.2 (#6869) [feature/9.x] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Runtime.win-x64: from 9.0.0-preview.6.24309.2 to 9.0.0-preview.6.24320.4 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) - Microsoft.NETCore.App.Runtime.win-x64: from 9.0.0-preview.6.24307.2 to 9.0.0-preview.6.24319.11 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) - VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0: from 9.0.0-preview.6.24309.2 to 9.0.0-preview.6.24320.4 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) - VS.Redist.Common.NetCore.SharedFramework.x64.9.0: from 9.0.0-preview.6.24307.2 to 9.0.0-preview.6.24319.11 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 282e92983fd..6bfb3968c56 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/aspnetcore - 7f2dfb0020ff29ab57df31e910f2b2d5ef48bf82 + 613c1e990b6b6411bda84456aefe14fe8e194279 https://github.com/dotnet/diagnostics @@ -46,21 +46,21 @@ https://github.com/dotnet/diagnostics 464e06c9a8602dff44ff5c59e9a0c3777f68e41c - + https://github.com/dotnet/runtime - 8fac5af2b11dc98fa0504f6fd06df790164ec958 + 117cfccdd71abc164e6b933ca7602b509a1365dd - + https://github.com/dotnet/aspnetcore - 7f2dfb0020ff29ab57df31e910f2b2d5ef48bf82 + 613c1e990b6b6411bda84456aefe14fe8e194279 - + https://github.com/dotnet/sdk - f3ebfb5ccb1ca3b072cee5b8f52a9e1087b2ad11 + dda66101344d41c7e1040cd5bcadcb2166780197 - + https://github.com/dotnet/runtime - 8fac5af2b11dc98fa0504f6fd06df790164ec958 + 117cfccdd71abc164e6b933ca7602b509a1365dd diff --git a/eng/Versions.props b/eng/Versions.props index 9cf30c383b6..838b8f91205 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,8 +52,8 @@ 9.0.0-beta.24320.6 9.0.0-beta.24320.6 - 9.0.0-preview.6.24309.2 - 9.0.0-preview.6.24309.2 + 9.0.0-preview.6.24320.4 + 9.0.0-preview.6.24320.4 2.0.0-beta4.24209.3 @@ -62,10 +62,10 @@ 9.0.0-preview.24318.1 - 9.0.0-preview.6.24307.2 - 9.0.0-preview.6.24307.2 + 9.0.0-preview.6.24319.11 + 9.0.0-preview.6.24319.11 - 9.0.100-preview.6.24319.5 + 9.0.100-preview.6.24321.2 1.0.532002 From c1a6401994cda9ebd082fabc8811a2ed8a2f03d1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 22 Jun 2024 14:05:51 +0000 Subject: [PATCH 264/568] Update dependencies from https://github.com/dotnet/arcade build 20240621.4 (#6871) [feature/9.x] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 ++++----- eng/Versions.props | 6 +-- .../job/publish-build-assets.yml | 9 ++-- .../post-build/common-variables.yml | 2 - .../core-templates/post-build/post-build.yml | 8 ++-- .../post-build/setup-maestro-vars.yml | 30 +++++++------- .../steps/component-governance.yml | 4 +- .../core-templates/steps/source-build.yml | 10 +++-- eng/common/cross/arm/sources.list.bionic | 11 ----- eng/common/cross/arm/sources.list.focal | 11 ----- eng/common/cross/arm/sources.list.jammy | 11 ----- eng/common/cross/arm/sources.list.jessie | 3 -- eng/common/cross/arm/sources.list.xenial | 11 ----- eng/common/cross/arm/sources.list.zesty | 11 ----- eng/common/cross/arm64/sources.list.bionic | 11 ----- eng/common/cross/arm64/sources.list.buster | 11 ----- eng/common/cross/arm64/sources.list.focal | 11 ----- eng/common/cross/arm64/sources.list.jammy | 11 ----- eng/common/cross/arm64/sources.list.stretch | 12 ------ eng/common/cross/arm64/sources.list.xenial | 11 ----- eng/common/cross/arm64/sources.list.zesty | 11 ----- eng/common/cross/armel/sources.list.jessie | 3 -- eng/common/cross/armv6/sources.list.bookworm | 2 - eng/common/cross/armv6/sources.list.buster | 2 - eng/common/cross/build-rootfs.sh | 41 ++++++++++++++----- eng/common/cross/ppc64le/sources.list.bionic | 11 ----- eng/common/cross/riscv64/sources.list.noble | 11 ----- eng/common/cross/riscv64/sources.list.sid | 1 - eng/common/cross/s390x/sources.list.bionic | 11 ----- eng/common/cross/x86/sources.list.bionic | 11 ----- eng/common/cross/x86/sources.list.focal | 11 ----- eng/common/cross/x86/sources.list.jammy | 11 ----- eng/common/cross/x86/sources.list.xenial | 11 ----- eng/common/post-build/publish-using-darc.ps1 | 16 ++++---- global.json | 4 +- 35 files changed, 86 insertions(+), 285 deletions(-) delete mode 100644 eng/common/cross/arm/sources.list.bionic delete mode 100644 eng/common/cross/arm/sources.list.focal delete mode 100644 eng/common/cross/arm/sources.list.jammy delete mode 100644 eng/common/cross/arm/sources.list.jessie delete mode 100644 eng/common/cross/arm/sources.list.xenial delete mode 100644 eng/common/cross/arm/sources.list.zesty delete mode 100644 eng/common/cross/arm64/sources.list.bionic delete mode 100644 eng/common/cross/arm64/sources.list.buster delete mode 100644 eng/common/cross/arm64/sources.list.focal delete mode 100644 eng/common/cross/arm64/sources.list.jammy delete mode 100644 eng/common/cross/arm64/sources.list.stretch delete mode 100644 eng/common/cross/arm64/sources.list.xenial delete mode 100644 eng/common/cross/arm64/sources.list.zesty delete mode 100644 eng/common/cross/armel/sources.list.jessie delete mode 100644 eng/common/cross/armv6/sources.list.bookworm delete mode 100644 eng/common/cross/armv6/sources.list.buster delete mode 100644 eng/common/cross/ppc64le/sources.list.bionic delete mode 100644 eng/common/cross/riscv64/sources.list.noble delete mode 100644 eng/common/cross/riscv64/sources.list.sid delete mode 100644 eng/common/cross/s390x/sources.list.bionic delete mode 100644 eng/common/cross/x86/sources.list.bionic delete mode 100644 eng/common/cross/x86/sources.list.focal delete mode 100644 eng/common/cross/x86/sources.list.jammy delete mode 100644 eng/common/cross/x86/sources.list.xenial diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6bfb3968c56..68453b23a77 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,25 +22,25 @@ https://github.com/dotnet/roslyn-analyzers f1115edce8633ebe03a86191bc05c6969ed9a821 - + https://github.com/dotnet/arcade - bfd4f951527e37d08f16f5cff09173943061601e + 3aba80fecac252e1cdaffcebc0a37a24a960228b - + https://github.com/dotnet/arcade - bfd4f951527e37d08f16f5cff09173943061601e + 3aba80fecac252e1cdaffcebc0a37a24a960228b - + https://github.com/dotnet/arcade - bfd4f951527e37d08f16f5cff09173943061601e + 3aba80fecac252e1cdaffcebc0a37a24a960228b - + https://github.com/dotnet/arcade - bfd4f951527e37d08f16f5cff09173943061601e + 3aba80fecac252e1cdaffcebc0a37a24a960228b - + https://github.com/dotnet/arcade - bfd4f951527e37d08f16f5cff09173943061601e + 3aba80fecac252e1cdaffcebc0a37a24a960228b https://github.com/dotnet/diagnostics diff --git a/eng/Versions.props b/eng/Versions.props index 838b8f91205..62a06c046a5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,9 +48,9 @@ --> - 9.0.0-beta.24320.6 - 9.0.0-beta.24320.6 - 9.0.0-beta.24320.6 + 9.0.0-beta.24321.4 + 9.0.0-beta.24321.4 + 9.0.0-beta.24321.4 9.0.0-preview.6.24320.4 9.0.0-preview.6.24320.4 diff --git a/eng/common/core-templates/job/publish-build-assets.yml b/eng/common/core-templates/job/publish-build-assets.yml index 8fe9299542c..2cf8e1853d0 100644 --- a/eng/common/core-templates/job/publish-build-assets.yml +++ b/eng/common/core-templates/job/publish-build-assets.yml @@ -87,13 +87,15 @@ jobs: - task: NuGetAuthenticate@1 - - task: PowerShell@2 + - task: AzureCLI@2 displayName: Publish Build Assets inputs: - filePath: eng\common\sdk-task.ps1 + azureSubscription: "Darc: Maestro Production" + scriptType: ps + scriptLocation: scriptPath + scriptPath: $(Build.SourcesDirectory)/eng/common/sdk-task.ps1 arguments: -task PublishBuildAssets -restore -msbuildEngine dotnet /p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests' - /p:BuildAssetRegistryToken=$(MaestroAccessToken) /p:MaestroApiEndpoint=https://maestro.dot.net /p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }} /p:OfficialBuildId=$(Build.BuildNumber) @@ -160,7 +162,6 @@ jobs: arguments: -BuildId $(BARBuildId) -PublishingInfraVersion 3 -AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)' - -MaestroToken '$(MaestroApiAccessToken)' -WaitPublishingFinish true -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' diff --git a/eng/common/core-templates/post-build/common-variables.yml b/eng/common/core-templates/post-build/common-variables.yml index b9ede10bf09..d5627a994ae 100644 --- a/eng/common/core-templates/post-build/common-variables.yml +++ b/eng/common/core-templates/post-build/common-variables.yml @@ -8,8 +8,6 @@ variables: # Default Maestro++ API Endpoint and API Version - name: MaestroApiEndPoint value: "https://maestro.dot.net" - - name: MaestroApiAccessToken - value: $(MaestroAccessToken) - name: MaestroApiVersion value: "2020-02-20" diff --git a/eng/common/core-templates/post-build/post-build.yml b/eng/common/core-templates/post-build/post-build.yml index fb15c40c03d..20924366b8a 100644 --- a/eng/common/core-templates/post-build/post-build.yml +++ b/eng/common/core-templates/post-build/post-build.yml @@ -300,14 +300,16 @@ stages: - task: NuGetAuthenticate@1 - - task: PowerShell@2 + - task: AzureCLI@2 displayName: Publish Using Darc inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 + azureSubscription: "Darc: Maestro Production" + scriptType: ps + scriptLocation: scriptPath + scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 arguments: -BuildId $(BARBuildId) -PublishingInfraVersion ${{ parameters.publishingInfraVersion }} -AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)' - -MaestroToken '$(MaestroApiAccessToken)' -WaitPublishingFinish true -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' diff --git a/eng/common/core-templates/post-build/setup-maestro-vars.yml b/eng/common/core-templates/post-build/setup-maestro-vars.yml index 8d56b572679..f7602980dbe 100644 --- a/eng/common/core-templates/post-build/setup-maestro-vars.yml +++ b/eng/common/core-templates/post-build/setup-maestro-vars.yml @@ -15,19 +15,20 @@ steps: artifactName: ReleaseConfigs checkDownloadedFiles: true - - task: PowerShell@2 + - task: AzureCLI@2 name: setReleaseVars displayName: Set Release Configs Vars inputs: - targetType: inline - pwsh: true - script: | + azureSubscription: "Darc: Maestro Production" + scriptType: pscore + scriptLocation: inlineScript + inlineScript: | try { if (!$Env:PromoteToMaestroChannels -or $Env:PromoteToMaestroChannels.Trim() -eq '') { $Content = Get-Content $(Build.StagingDirectory)/ReleaseConfigs/ReleaseConfigs.txt $BarId = $Content | Select -Index 0 - $Channels = $Content | Select -Index 1 + $Channels = $Content | Select -Index 1 $IsStableBuild = $Content | Select -Index 2 $AzureDevOpsProject = $Env:System_TeamProject @@ -35,15 +36,16 @@ steps: $AzureDevOpsBuildId = $Env:Build_BuildId } else { - $buildApiEndpoint = "${Env:MaestroApiEndPoint}/api/builds/${Env:BARBuildId}?api-version=${Env:MaestroApiVersion}" + . $(Build.SourcesDirectory)\eng\common\tools.ps1 + $darc = Get-Darc + $buildInfo = & $darc get-build ` + --id ${{ parameters.BARBuildId }} ` + --extended ` + --output-format json ` + --ci ` + | convertFrom-Json - $apiHeaders = New-Object 'System.Collections.Generic.Dictionary[[String],[String]]' - $apiHeaders.Add('Accept', 'application/json') - $apiHeaders.Add('Authorization',"Bearer ${Env:MAESTRO_API_TOKEN}") - - $buildInfo = try { Invoke-WebRequest -Method Get -Uri $buildApiEndpoint -Headers $apiHeaders | ConvertFrom-Json } catch { Write-Host "Error: $_" } - - $BarId = $Env:BARBuildId + $BarId = ${{ parameters.BARBuildId }} $Channels = $Env:PromoteToMaestroChannels -split "," $Channels = $Channels -join "][" $Channels = "[$Channels]" @@ -69,6 +71,4 @@ steps: exit 1 } env: - MAESTRO_API_TOKEN: $(MaestroApiAccessToken) - BARBuildId: ${{ parameters.BARBuildId }} PromoteToMaestroChannels: ${{ parameters.PromoteToChannelIds }} diff --git a/eng/common/core-templates/steps/component-governance.yml b/eng/common/core-templates/steps/component-governance.yml index df449a34c11..b8815892a5e 100644 --- a/eng/common/core-templates/steps/component-governance.yml +++ b/eng/common/core-templates/steps/component-governance.yml @@ -2,7 +2,8 @@ parameters: disableComponentGovernance: false componentGovernanceIgnoreDirectories: '' is1ESPipeline: false - + displayName: 'Component Detection' + steps: - ${{ if eq(parameters.disableComponentGovernance, 'true') }}: - script: echo "##vso[task.setvariable variable=skipComponentGovernanceDetection]true" @@ -10,5 +11,6 @@ steps: - ${{ if ne(parameters.disableComponentGovernance, 'true') }}: - task: ComponentGovernanceComponentDetection@0 continueOnError: true + displayName: ${{ parameters.displayName }} inputs: ignoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }} \ No newline at end of file diff --git a/eng/common/core-templates/steps/source-build.yml b/eng/common/core-templates/steps/source-build.yml index 16c778d92cb..2915d29bb7f 100644 --- a/eng/common/core-templates/steps/source-build.yml +++ b/eng/common/core-templates/steps/source-build.yml @@ -121,7 +121,9 @@ steps: # a nupkg cache of input packages (a local feed). # This path must match the upstream cache path in property 'CurrentRepoSourceBuiltNupkgCacheDir' # in src\Microsoft.DotNet.Arcade.Sdk\tools\SourceBuild\SourceBuildArcade.targets -- task: ComponentGovernanceComponentDetection@0 - displayName: Component Detection (Exclude upstream cache) - inputs: - ignoreDirectories: '$(Build.SourcesDirectory)/artifacts/sb/src/artifacts/obj/source-built-upstream-cache' +- template: /eng/common/core-templates/steps/component-governance.yml + parameters: + displayName: Component Detection (Exclude upstream cache) + is1ESPipeline: ${{ parameters.is1ESPipeline }} + componentGovernanceIgnoreDirectories: '$(Build.SourcesDirectory)/artifacts/sb/src/artifacts/obj/source-built-upstream-cache' + disableComponentGovernance: ${{ eq(variables['System.TeamProject'], 'public') }} diff --git a/eng/common/cross/arm/sources.list.bionic b/eng/common/cross/arm/sources.list.bionic deleted file mode 100644 index 21095574095..00000000000 --- a/eng/common/cross/arm/sources.list.bionic +++ /dev/null @@ -1,11 +0,0 @@ -deb http://ports.ubuntu.com/ubuntu-ports/ bionic main restricted universe -deb-src http://ports.ubuntu.com/ubuntu-ports/ bionic main restricted universe - -deb http://ports.ubuntu.com/ubuntu-ports/ bionic-updates main restricted universe -deb-src http://ports.ubuntu.com/ubuntu-ports/ bionic-updates main restricted universe - -deb http://ports.ubuntu.com/ubuntu-ports/ bionic-backports main restricted -deb-src http://ports.ubuntu.com/ubuntu-ports/ bionic-backports main restricted - -deb http://ports.ubuntu.com/ubuntu-ports/ bionic-security main restricted universe multiverse -deb-src http://ports.ubuntu.com/ubuntu-ports/ bionic-security main restricted universe multiverse diff --git a/eng/common/cross/arm/sources.list.focal b/eng/common/cross/arm/sources.list.focal deleted file mode 100644 index 4de2600c174..00000000000 --- a/eng/common/cross/arm/sources.list.focal +++ /dev/null @@ -1,11 +0,0 @@ -deb http://ports.ubuntu.com/ubuntu-ports/ focal main restricted universe -deb-src http://ports.ubuntu.com/ubuntu-ports/ focal main restricted universe - -deb http://ports.ubuntu.com/ubuntu-ports/ focal-updates main restricted universe -deb-src http://ports.ubuntu.com/ubuntu-ports/ focal-updates main restricted universe - -deb http://ports.ubuntu.com/ubuntu-ports/ focal-backports main restricted -deb-src http://ports.ubuntu.com/ubuntu-ports/ focal-backports main restricted - -deb http://ports.ubuntu.com/ubuntu-ports/ focal-security main restricted universe multiverse -deb-src http://ports.ubuntu.com/ubuntu-ports/ focal-security main restricted universe multiverse diff --git a/eng/common/cross/arm/sources.list.jammy b/eng/common/cross/arm/sources.list.jammy deleted file mode 100644 index 6bb0453029c..00000000000 --- a/eng/common/cross/arm/sources.list.jammy +++ /dev/null @@ -1,11 +0,0 @@ -deb http://ports.ubuntu.com/ubuntu-ports/ jammy main restricted universe -deb-src http://ports.ubuntu.com/ubuntu-ports/ jammy main restricted universe - -deb http://ports.ubuntu.com/ubuntu-ports/ jammy-updates main restricted universe -deb-src http://ports.ubuntu.com/ubuntu-ports/ jammy-updates main restricted universe - -deb http://ports.ubuntu.com/ubuntu-ports/ jammy-backports main restricted -deb-src http://ports.ubuntu.com/ubuntu-ports/ jammy-backports main restricted - -deb http://ports.ubuntu.com/ubuntu-ports/ jammy-security main restricted universe multiverse -deb-src http://ports.ubuntu.com/ubuntu-ports/ jammy-security main restricted universe multiverse diff --git a/eng/common/cross/arm/sources.list.jessie b/eng/common/cross/arm/sources.list.jessie deleted file mode 100644 index 4d142ac9b10..00000000000 --- a/eng/common/cross/arm/sources.list.jessie +++ /dev/null @@ -1,3 +0,0 @@ -# Debian (sid) # UNSTABLE -deb http://ftp.debian.org/debian/ sid main contrib non-free -deb-src http://ftp.debian.org/debian/ sid main contrib non-free diff --git a/eng/common/cross/arm/sources.list.xenial b/eng/common/cross/arm/sources.list.xenial deleted file mode 100644 index 56fbb36a59f..00000000000 --- a/eng/common/cross/arm/sources.list.xenial +++ /dev/null @@ -1,11 +0,0 @@ -deb http://ports.ubuntu.com/ubuntu-ports/ xenial main restricted universe -deb-src http://ports.ubuntu.com/ubuntu-ports/ xenial main restricted universe - -deb http://ports.ubuntu.com/ubuntu-ports/ xenial-updates main restricted universe -deb-src http://ports.ubuntu.com/ubuntu-ports/ xenial-updates main restricted universe - -deb http://ports.ubuntu.com/ubuntu-ports/ xenial-backports main restricted -deb-src http://ports.ubuntu.com/ubuntu-ports/ xenial-backports main restricted - -deb http://ports.ubuntu.com/ubuntu-ports/ xenial-security main restricted universe multiverse -deb-src http://ports.ubuntu.com/ubuntu-ports/ xenial-security main restricted universe multiverse diff --git a/eng/common/cross/arm/sources.list.zesty b/eng/common/cross/arm/sources.list.zesty deleted file mode 100644 index ea2c14a7874..00000000000 --- a/eng/common/cross/arm/sources.list.zesty +++ /dev/null @@ -1,11 +0,0 @@ -deb http://ports.ubuntu.com/ubuntu-ports/ zesty main restricted universe -deb-src http://ports.ubuntu.com/ubuntu-ports/ zesty main restricted universe - -deb http://ports.ubuntu.com/ubuntu-ports/ zesty-updates main restricted universe -deb-src http://ports.ubuntu.com/ubuntu-ports/ zesty-updates main restricted universe - -deb http://ports.ubuntu.com/ubuntu-ports/ zesty-backports main restricted -deb-src http://ports.ubuntu.com/ubuntu-ports/ zesty-backports main restricted - -deb http://ports.ubuntu.com/ubuntu-ports/ zesty-security main restricted universe multiverse -deb-src http://ports.ubuntu.com/ubuntu-ports/ zesty-security main restricted universe multiverse diff --git a/eng/common/cross/arm64/sources.list.bionic b/eng/common/cross/arm64/sources.list.bionic deleted file mode 100644 index 21095574095..00000000000 --- a/eng/common/cross/arm64/sources.list.bionic +++ /dev/null @@ -1,11 +0,0 @@ -deb http://ports.ubuntu.com/ubuntu-ports/ bionic main restricted universe -deb-src http://ports.ubuntu.com/ubuntu-ports/ bionic main restricted universe - -deb http://ports.ubuntu.com/ubuntu-ports/ bionic-updates main restricted universe -deb-src http://ports.ubuntu.com/ubuntu-ports/ bionic-updates main restricted universe - -deb http://ports.ubuntu.com/ubuntu-ports/ bionic-backports main restricted -deb-src http://ports.ubuntu.com/ubuntu-ports/ bionic-backports main restricted - -deb http://ports.ubuntu.com/ubuntu-ports/ bionic-security main restricted universe multiverse -deb-src http://ports.ubuntu.com/ubuntu-ports/ bionic-security main restricted universe multiverse diff --git a/eng/common/cross/arm64/sources.list.buster b/eng/common/cross/arm64/sources.list.buster deleted file mode 100644 index 7194ac64a96..00000000000 --- a/eng/common/cross/arm64/sources.list.buster +++ /dev/null @@ -1,11 +0,0 @@ -deb http://deb.debian.org/debian buster main -deb-src http://deb.debian.org/debian buster main - -deb http://deb.debian.org/debian-security/ buster/updates main -deb-src http://deb.debian.org/debian-security/ buster/updates main - -deb http://deb.debian.org/debian buster-updates main -deb-src http://deb.debian.org/debian buster-updates main - -deb http://deb.debian.org/debian buster-backports main contrib non-free -deb-src http://deb.debian.org/debian buster-backports main contrib non-free diff --git a/eng/common/cross/arm64/sources.list.focal b/eng/common/cross/arm64/sources.list.focal deleted file mode 100644 index 4de2600c174..00000000000 --- a/eng/common/cross/arm64/sources.list.focal +++ /dev/null @@ -1,11 +0,0 @@ -deb http://ports.ubuntu.com/ubuntu-ports/ focal main restricted universe -deb-src http://ports.ubuntu.com/ubuntu-ports/ focal main restricted universe - -deb http://ports.ubuntu.com/ubuntu-ports/ focal-updates main restricted universe -deb-src http://ports.ubuntu.com/ubuntu-ports/ focal-updates main restricted universe - -deb http://ports.ubuntu.com/ubuntu-ports/ focal-backports main restricted -deb-src http://ports.ubuntu.com/ubuntu-ports/ focal-backports main restricted - -deb http://ports.ubuntu.com/ubuntu-ports/ focal-security main restricted universe multiverse -deb-src http://ports.ubuntu.com/ubuntu-ports/ focal-security main restricted universe multiverse diff --git a/eng/common/cross/arm64/sources.list.jammy b/eng/common/cross/arm64/sources.list.jammy deleted file mode 100644 index 6bb0453029c..00000000000 --- a/eng/common/cross/arm64/sources.list.jammy +++ /dev/null @@ -1,11 +0,0 @@ -deb http://ports.ubuntu.com/ubuntu-ports/ jammy main restricted universe -deb-src http://ports.ubuntu.com/ubuntu-ports/ jammy main restricted universe - -deb http://ports.ubuntu.com/ubuntu-ports/ jammy-updates main restricted universe -deb-src http://ports.ubuntu.com/ubuntu-ports/ jammy-updates main restricted universe - -deb http://ports.ubuntu.com/ubuntu-ports/ jammy-backports main restricted -deb-src http://ports.ubuntu.com/ubuntu-ports/ jammy-backports main restricted - -deb http://ports.ubuntu.com/ubuntu-ports/ jammy-security main restricted universe multiverse -deb-src http://ports.ubuntu.com/ubuntu-ports/ jammy-security main restricted universe multiverse diff --git a/eng/common/cross/arm64/sources.list.stretch b/eng/common/cross/arm64/sources.list.stretch deleted file mode 100644 index 0e121577436..00000000000 --- a/eng/common/cross/arm64/sources.list.stretch +++ /dev/null @@ -1,12 +0,0 @@ -deb http://deb.debian.org/debian stretch main -deb-src http://deb.debian.org/debian stretch main - -deb http://deb.debian.org/debian-security/ stretch/updates main -deb-src http://deb.debian.org/debian-security/ stretch/updates main - -deb http://deb.debian.org/debian stretch-updates main -deb-src http://deb.debian.org/debian stretch-updates main - -deb http://deb.debian.org/debian stretch-backports main contrib non-free -deb-src http://deb.debian.org/debian stretch-backports main contrib non-free - diff --git a/eng/common/cross/arm64/sources.list.xenial b/eng/common/cross/arm64/sources.list.xenial deleted file mode 100644 index 56fbb36a59f..00000000000 --- a/eng/common/cross/arm64/sources.list.xenial +++ /dev/null @@ -1,11 +0,0 @@ -deb http://ports.ubuntu.com/ubuntu-ports/ xenial main restricted universe -deb-src http://ports.ubuntu.com/ubuntu-ports/ xenial main restricted universe - -deb http://ports.ubuntu.com/ubuntu-ports/ xenial-updates main restricted universe -deb-src http://ports.ubuntu.com/ubuntu-ports/ xenial-updates main restricted universe - -deb http://ports.ubuntu.com/ubuntu-ports/ xenial-backports main restricted -deb-src http://ports.ubuntu.com/ubuntu-ports/ xenial-backports main restricted - -deb http://ports.ubuntu.com/ubuntu-ports/ xenial-security main restricted universe multiverse -deb-src http://ports.ubuntu.com/ubuntu-ports/ xenial-security main restricted universe multiverse diff --git a/eng/common/cross/arm64/sources.list.zesty b/eng/common/cross/arm64/sources.list.zesty deleted file mode 100644 index ea2c14a7874..00000000000 --- a/eng/common/cross/arm64/sources.list.zesty +++ /dev/null @@ -1,11 +0,0 @@ -deb http://ports.ubuntu.com/ubuntu-ports/ zesty main restricted universe -deb-src http://ports.ubuntu.com/ubuntu-ports/ zesty main restricted universe - -deb http://ports.ubuntu.com/ubuntu-ports/ zesty-updates main restricted universe -deb-src http://ports.ubuntu.com/ubuntu-ports/ zesty-updates main restricted universe - -deb http://ports.ubuntu.com/ubuntu-ports/ zesty-backports main restricted -deb-src http://ports.ubuntu.com/ubuntu-ports/ zesty-backports main restricted - -deb http://ports.ubuntu.com/ubuntu-ports/ zesty-security main restricted universe multiverse -deb-src http://ports.ubuntu.com/ubuntu-ports/ zesty-security main restricted universe multiverse diff --git a/eng/common/cross/armel/sources.list.jessie b/eng/common/cross/armel/sources.list.jessie deleted file mode 100644 index 3d9c3059d89..00000000000 --- a/eng/common/cross/armel/sources.list.jessie +++ /dev/null @@ -1,3 +0,0 @@ -# Debian (jessie) # Stable -deb http://ftp.debian.org/debian/ jessie main contrib non-free -deb-src http://ftp.debian.org/debian/ jessie main contrib non-free diff --git a/eng/common/cross/armv6/sources.list.bookworm b/eng/common/cross/armv6/sources.list.bookworm deleted file mode 100644 index 10161135265..00000000000 --- a/eng/common/cross/armv6/sources.list.bookworm +++ /dev/null @@ -1,2 +0,0 @@ -deb http://raspbian.raspberrypi.org/raspbian/ bookworm main contrib non-free rpi -deb-src http://raspbian.raspberrypi.org/raspbian/ bookworm main contrib non-free rpi diff --git a/eng/common/cross/armv6/sources.list.buster b/eng/common/cross/armv6/sources.list.buster deleted file mode 100644 index f27fc4fb346..00000000000 --- a/eng/common/cross/armv6/sources.list.buster +++ /dev/null @@ -1,2 +0,0 @@ -deb http://raspbian.raspberrypi.org/raspbian/ buster main contrib non-free rpi -deb-src http://raspbian.raspberrypi.org/raspbian/ buster main contrib non-free rpi diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index 8bb233ba25b..eb1a9080464 100644 --- a/eng/common/cross/build-rootfs.sh +++ b/eng/common/cross/build-rootfs.sh @@ -30,7 +30,8 @@ __IllumosArch=arm7 __HaikuArch=arm __QEMUArch=arm __UbuntuArch=armhf -__UbuntuRepo="http://ports.ubuntu.com/" +__UbuntuRepo= +__UbuntuSuites="updates security backports" __LLDB_Package="liblldb-3.9-dev" __SkipUnmount=0 @@ -129,9 +130,9 @@ __AlpineKeys=' 616db30d:MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAnpUpyWDWjlUk3smlWeA0\nlIMW+oJ38t92CRLHH3IqRhyECBRW0d0aRGtq7TY8PmxjjvBZrxTNDpJT6KUk4LRm\na6A6IuAI7QnNK8SJqM0DLzlpygd7GJf8ZL9SoHSH+gFsYF67Cpooz/YDqWrlN7Vw\ntO00s0B+eXy+PCXYU7VSfuWFGK8TGEv6HfGMALLjhqMManyvfp8hz3ubN1rK3c8C\nUS/ilRh1qckdbtPvoDPhSbTDmfU1g/EfRSIEXBrIMLg9ka/XB9PvWRrekrppnQzP\nhP9YE3x/wbFc5QqQWiRCYyQl/rgIMOXvIxhkfe8H5n1Et4VAorkpEAXdsfN8KSVv\nLSMazVlLp9GYq5SUpqYX3KnxdWBgN7BJoZ4sltsTpHQ/34SXWfu3UmyUveWj7wp0\nx9hwsPirVI00EEea9AbP7NM2rAyu6ukcm4m6ATd2DZJIViq2es6m60AE6SMCmrQF\nwmk4H/kdQgeAELVfGOm2VyJ3z69fQuywz7xu27S6zTKi05Qlnohxol4wVb6OB7qG\nLPRtK9ObgzRo/OPumyXqlzAi/Yvyd1ZQk8labZps3e16bQp8+pVPiumWioMFJDWV\nGZjCmyMSU8V6MB6njbgLHoyg2LCukCAeSjbPGGGYhnKLm1AKSoJh3IpZuqcKCk5C\n8CM1S15HxV78s9dFntEqIokCAwEAAQ== ' __Keyring= +__KeyringFile="/usr/share/keyrings/ubuntu-archive-keyring.gpg" __SkipSigCheck=0 __UseMirror=0 -__UseDeb822Format=0 __UnprocessedBuildArgs= while :; do @@ -163,6 +164,7 @@ while :; do __UbuntuArch=armel __UbuntuRepo="http://ftp.debian.org/debian/" __CodeName=jessie + __KeyringFile="/usr/share/keyrings/debian-archive-keyring.gpg" ;; armv6) __BuildArch=armv6 @@ -170,10 +172,12 @@ while :; do __QEMUArch=arm __UbuntuRepo="http://raspbian.raspberrypi.org/raspbian/" __CodeName=buster + __KeyringFile="/usr/share/keyrings/raspbian-archive-keyring.gpg" __LLDB_Package="liblldb-6.0-dev" + __UbuntuSuites= - if [[ -e "/usr/share/keyrings/raspbian-archive-keyring.gpg" ]]; then - __Keyring="--keyring /usr/share/keyrings/raspbian-archive-keyring.gpg" + if [[ -e "$__KeyringFile" ]]; then + __Keyring="--keyring $__KeyringFile" fi ;; riscv64) @@ -184,10 +188,6 @@ while :; do __UbuntuArch=riscv64 __UbuntuPackages="${__UbuntuPackages// libunwind8-dev/}" unset __LLDB_Package - - 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) __BuildArch=ppc64le @@ -292,10 +292,13 @@ while :; do if [[ "$__CodeName" != "jessie" ]]; then __CodeName=noble fi - __UseDeb822Format=1 + if [[ -n "$__LLDB_Package" ]]; then + __LLDB_Package="liblldb-18-dev" + fi ;; jessie) # Debian 8 __CodeName=jessie + __KeyringFile="/usr/share/keyrings/debian-archive-keyring.gpg" if [[ -z "$__UbuntuRepo" ]]; then __UbuntuRepo="http://ftp.debian.org/debian/" @@ -304,6 +307,7 @@ while :; do stretch) # Debian 9 __CodeName=stretch __LLDB_Package="liblldb-6.0-dev" + __KeyringFile="/usr/share/keyrings/debian-archive-keyring.gpg" if [[ -z "$__UbuntuRepo" ]]; then __UbuntuRepo="http://ftp.debian.org/debian/" @@ -312,6 +316,7 @@ while :; do buster) # Debian 10 __CodeName=buster __LLDB_Package="liblldb-6.0-dev" + __KeyringFile="/usr/share/keyrings/debian-archive-keyring.gpg" if [[ -z "$__UbuntuRepo" ]]; then __UbuntuRepo="http://ftp.debian.org/debian/" @@ -319,6 +324,7 @@ while :; do ;; bullseye) # Debian 11 __CodeName=bullseye + __KeyringFile="/usr/share/keyrings/debian-archive-keyring.gpg" if [[ -z "$__UbuntuRepo" ]]; then __UbuntuRepo="http://ftp.debian.org/debian/" @@ -326,6 +332,7 @@ while :; do ;; bookworm) # Debian 12 __CodeName=bookworm + __KeyringFile="/usr/share/keyrings/debian-archive-keyring.gpg" if [[ -z "$__UbuntuRepo" ]]; then __UbuntuRepo="http://ftp.debian.org/debian/" @@ -333,6 +340,7 @@ while :; do ;; sid) # Debian sid __CodeName=sid + __KeyringFile="/usr/share/keyrings/debian-archive-keyring.gpg" if [[ -z "$__UbuntuRepo" ]]; then __UbuntuRepo="http://ftp.debian.org/debian/" @@ -442,6 +450,10 @@ fi __UbuntuPackages+=" ${__LLDB_Package:-}" +if [[ -z "$__UbuntuRepo" ]]; then + __UbuntuRepo="http://ports.ubuntu.com/" +fi + if [[ -n "$__LLVM_MajorVersion" ]]; then __UbuntuPackages+=" libclang-common-${__LLVM_MajorVersion}${__LLVM_MinorVersion:+.$__LLVM_MinorVersion}-dev" fi @@ -740,9 +752,16 @@ elif [[ -n "$__CodeName" ]]; then # shellcheck disable=SC2086 echo running debootstrap "--variant=minbase" $__Keyring --arch "$__UbuntuArch" "$__CodeName" "$__RootfsDir" "$__UbuntuRepo" debootstrap "--variant=minbase" $__Keyring --arch "$__UbuntuArch" "$__CodeName" "$__RootfsDir" "$__UbuntuRepo" + mkdir -p "$__RootfsDir/etc/apt/sources.list.d/" - grep -q "Types:" "$__CrossDir/$__BuildArch/sources.list.$__CodeName" && filename="$__CodeName.sources" || filename="$__CodeName.list" - cp "$__CrossDir/$__BuildArch/sources.list.$__CodeName" "$__RootfsDir/etc/apt/sources.list.d/$filename" + cat > "$__RootfsDir/etc/apt/sources.list.d/$__CodeName.sources" < Date: Sat, 22 Jun 2024 14:16:52 +0000 Subject: [PATCH 265/568] Update dependencies from https://github.com/dotnet/sdk build 20240621.3 (#6873) [feature/9.x] Update dependencies from dotnet/sdk --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 68453b23a77..7c7748601ce 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,9 +54,9 @@ https://github.com/dotnet/aspnetcore 613c1e990b6b6411bda84456aefe14fe8e194279 - + https://github.com/dotnet/sdk - dda66101344d41c7e1040cd5bcadcb2166780197 + 941ec62ab28b01b4efcab6bcdaec37b2d319b965 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 62a06c046a5..9488677cc7c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,7 +65,7 @@ 9.0.0-preview.6.24319.11 9.0.0-preview.6.24319.11 - 9.0.100-preview.6.24321.2 + 9.0.100-preview.7.24321.3 1.0.532002 From 797f30f1cb4d6327b0c8a0c756d800200e28f82e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 23 Jun 2024 12:52:07 +0000 Subject: [PATCH 266/568] Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20240623.1 Microsoft.CodeAnalysis.NetAnalyzers From Version 9.0.0-preview.24318.1 -> To Version 9.0.0-preview.24323.1 --- eng/Version.Details.xml | 2 +- eng/Versions.props | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7c7748601ce..f0842c2b434 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -18,7 +18,7 @@ - + https://github.com/dotnet/roslyn-analyzers f1115edce8633ebe03a86191bc05c6969ed9a821 diff --git a/eng/Versions.props b/eng/Versions.props index 9488677cc7c..e310fb1ddcb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -60,7 +60,7 @@ 8.0.0-preview.24320.2 8.0.0-preview.24320.2 - 9.0.0-preview.24318.1 + 9.0.0-preview.24323.1 9.0.0-preview.6.24319.11 9.0.0-preview.6.24319.11 From 3645d12378550821c9195262c3ed52900c4c4caf Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 24 Jun 2024 00:08:31 +0000 Subject: [PATCH 267/568] Restore branch-specific files --- .../templates-official/job/source-build.yml | 73 +------------------ .../templates-official/jobs/source-build.yml | 54 +------------- .../steps/enable-internal-runtimes.yml | 31 ++------ .../steps/get-delegation-sas.yml | 46 ++---------- .../steps/get-federated-access-token.yml | 33 ++------- eng/common/templates/job/source-build.yml | 72 +----------------- eng/common/templates/jobs/source-build.yml | 54 +------------- .../steps/enable-internal-runtimes.yml | 30 ++------ .../templates/steps/get-delegation-sas.yml | 46 ++---------- .../steps/get-federated-access-token.yml | 33 ++------- 10 files changed, 42 insertions(+), 430 deletions(-) diff --git a/eng/common/templates-official/job/source-build.yml b/eng/common/templates-official/job/source-build.yml index a258867dd22..1a480034b67 100644 --- a/eng/common/templates-official/job/source-build.yml +++ b/eng/common/templates-official/job/source-build.yml @@ -1,76 +1,7 @@ -parameters: - # This template adds arcade-powered source-build to CI. The template produces a server job with a - # default ID 'Source_Build_Complete' to put in a dependency list if necessary. - - # Specifies the prefix for source-build jobs added to pipeline. Use this if disambiguation needed. - jobNamePrefix: 'Source_Build' - - # Defines the platform on which to run the job. By default, a linux-x64 machine, suitable for - # managed-only repositories. This is an object with these properties: - # - # name: '' - # The name of the job. This is included in the job ID. - # targetRID: '' - # The name of the target RID to use, instead of the one auto-detected by Arcade. - # nonPortable: false - # Enables non-portable mode. This means a more specific RID (e.g. fedora.32-x64 rather than - # linux-x64), and compiling against distro-provided packages rather than portable ones. - # skipPublishValidation: false - # Disables publishing validation. By default, a check is performed to ensure no packages are - # published by source-build. - # container: '' - # A container to use. Runs in docker. - # pool: {} - # A pool to use. Runs directly on an agent. - # buildScript: '' - # Specifies the build script to invoke to perform the build in the repo. The default - # './build.sh' should work for typical Arcade repositories, but this is customizable for - # difficult situations. - # jobProperties: {} - # A list of job properties to inject at the top level, for potential extensibility beyond - # container and pool. - platform: {} - - # If set to true and running on a non-public project, - # Internal blob storage locations will be enabled. - # This is not enabled by default because many repositories do not need internal sources - # and do not need to have the required service connections approved in the pipeline. - enableInternalSources: false - jobs: - template: /eng/common/core-templates/job/source-build.yml parameters: is1ESPipeline: true - ${{ each property in parameters.platform.jobProperties }}: - ${{ property.key }}: ${{ property.value }} - - ${{ if ne(parameters.platform.container, '') }}: - container: ${{ parameters.platform.container }} - - ${{ if eq(parameters.platform.pool, '') }}: - # The default VM host AzDO pool. This should be capable of running Docker containers: almost all - # source-build builds run in Docker, including the default managed platform. - # /eng/common/templates-official/variables/pool-providers.yml can't be used here (some customers declare variables already), so duplicate its logic - pool: - ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore-Svc-Public' ), False, 'NetCore-Public')] - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open - - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')] - image: 1es-mariner-2 - os: linux - - ${{ if ne(parameters.platform.pool, '') }}: - pool: ${{ parameters.platform.pool }} - - workspace: - clean: all - - steps: - - ${{ if eq(parameters.enableInternalSources, true) }}: - - template: /eng/common/templates-official/steps/enable-internal-runtimes.yml - - template: /eng/common/templates-official/steps/source-build.yml - parameters: - platform: ${{ parameters.platform }} + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/eng/common/templates-official/jobs/source-build.yml b/eng/common/templates-official/jobs/source-build.yml index 914bcd1c3e9..483e7b611f3 100644 --- a/eng/common/templates-official/jobs/source-build.yml +++ b/eng/common/templates-official/jobs/source-build.yml @@ -1,57 +1,7 @@ -parameters: - # This template adds arcade-powered source-build to CI. A job is created for each platform, as - # well as an optional server job that completes when all platform jobs complete. - - # The name of the "join" job for all source-build platforms. If set to empty string, the job is - # not included. Existing repo pipelines can use this job depend on all source-build jobs - # completing without maintaining a separate list of every single job ID: just depend on this one - # server job. By default, not included. Recommended name if used: 'Source_Build_Complete'. - allCompletedJobId: '' - - # See /eng/common/templates-official/job/source-build.yml - jobNamePrefix: 'Source_Build' - - # This is the default platform provided by Arcade, intended for use by a managed-only repo. - defaultManagedPlatform: - name: 'Managed' - container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8' - - # Defines the platforms on which to run build jobs. One job is created for each platform, and the - # object in this array is sent to the job template as 'platform'. If no platforms are specified, - # one job runs on 'defaultManagedPlatform'. - platforms: [] - - # If set to true and running on a non-public project, - # Internal nuget and blob storage locations will be enabled. - # This is not enabled by default because many repositories do not need internal sources - # and do not need to have the required service connections approved in the pipeline. - enableInternalSources: false - jobs: - template: /eng/common/core-templates/jobs/source-build.yml parameters: is1ESPipeline: true -- ${{ if ne(parameters.allCompletedJobId, '') }}: - - job: ${{ parameters.allCompletedJobId }} - displayName: Source-Build Complete - pool: server - dependsOn: - - ${{ each platform in parameters.platforms }}: - - ${{ parameters.jobNamePrefix }}_${{ platform.name }} - - ${{ if eq(length(parameters.platforms), 0) }}: - - ${{ parameters.jobNamePrefix }}_${{ parameters.defaultManagedPlatform.name }} - -- ${{ each platform in parameters.platforms }}: - - template: /eng/common/templates-official/job/source-build.yml - parameters: - jobNamePrefix: ${{ parameters.jobNamePrefix }} - platform: ${{ platform }} - enableInternalSources: ${{ parameters.enableInternalSources }} - -- ${{ if eq(length(parameters.platforms), 0) }}: - - template: /eng/common/templates-official/job/source-build.yml - parameters: - jobNamePrefix: ${{ parameters.jobNamePrefix }} - platform: ${{ parameters.defaultManagedPlatform }} - enableInternalSources: ${{ parameters.enableInternalSources }} + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} \ No newline at end of file diff --git a/eng/common/templates-official/steps/enable-internal-runtimes.yml b/eng/common/templates-official/steps/enable-internal-runtimes.yml index 93a8394a666..f9dd238c6cd 100644 --- a/eng/common/templates-official/steps/enable-internal-runtimes.yml +++ b/eng/common/templates-official/steps/enable-internal-runtimes.yml @@ -1,28 +1,9 @@ # Obtains internal runtime download credentials and populates the 'dotnetbuilds-internal-container-read-token-base64' # variable with the base64-encoded SAS token, by default - -parameters: -- name: federatedServiceConnection - type: string - default: 'dotnetbuilds-internal-read' -- name: outputVariableName - type: string - default: 'dotnetbuilds-internal-container-read-token-base64' -- name: expiryInHours - type: number - default: 1 -- name: base64Encode - type: boolean - default: true - steps: -- ${{ if ne(variables['System.TeamProject'], 'public') }}: - - template: /eng/common/templates-official/steps/get-delegation-sas.yml - parameters: - federatedServiceConnection: ${{ parameters.federatedServiceConnection }} - outputVariableName: ${{ parameters.outputVariableName }} - expiryInHours: ${{ parameters.expiryInHours }} - base64Encode: ${{ parameters.base64Encode }} - storageAccount: dotnetbuilds - container: internal - permissions: rl +- template: /eng/common/core-templates/steps/enable-internal-runtimes.yml + parameters: + is1ESPipeline: true + + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/eng/common/templates-official/steps/get-delegation-sas.yml b/eng/common/templates-official/steps/get-delegation-sas.yml index c0e8f91317f..c5a9c1f8275 100644 --- a/eng/common/templates-official/steps/get-delegation-sas.yml +++ b/eng/common/templates-official/steps/get-delegation-sas.yml @@ -1,43 +1,7 @@ -parameters: -- name: federatedServiceConnection - type: string -- name: outputVariableName - type: string -- name: expiryInHours - type: number - default: 1 -- name: base64Encode - type: boolean - default: false -- name: storageAccount - type: string -- name: container - type: string -- name: permissions - type: string - default: 'rl' - steps: -- task: AzureCLI@2 - displayName: 'Generate delegation SAS Token for ${{ parameters.storageAccount }}/${{ parameters.container }}' - inputs: - azureSubscription: ${{ parameters.federatedServiceConnection }} - scriptType: 'pscore' - scriptLocation: 'inlineScript' - inlineScript: | - # Calculate the expiration of the SAS token and convert to UTC - $expiry = (Get-Date).AddHours(${{ parameters.expiryInHours }}).ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ssZ") - - $sas = az storage container generate-sas --account-name ${{ parameters.storageAccount }} --name ${{ parameters.container }} --permissions ${{ parameters.permissions }} --expiry $expiry --auth-mode login --as-user -o tsv - - if ($LASTEXITCODE -ne 0) { - Write-Error "Failed to generate SAS token." - exit 1 - } - - if ('${{ parameters.base64Encode }}' -eq 'true') { - $sas = [Convert]::ToBase64String([System.Text.Encoding]::UTF8.GetBytes($sas)) - } +- template: /eng/common/core-templates/steps/get-delegation-sas.yml + parameters: + is1ESPipeline: true - Write-Host "Setting '${{ parameters.outputVariableName }}' with the access token value" - Write-Host "##vso[task.setvariable variable=${{ parameters.outputVariableName }};issecret=true]$sas" + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/eng/common/templates-official/steps/get-federated-access-token.yml b/eng/common/templates-official/steps/get-federated-access-token.yml index e3786cef6df..c8dcf6b8139 100644 --- a/eng/common/templates-official/steps/get-federated-access-token.yml +++ b/eng/common/templates-official/steps/get-federated-access-token.yml @@ -1,28 +1,7 @@ -parameters: -- name: federatedServiceConnection - type: string -- name: outputVariableName - type: string -# Resource to get a token for. Common values include: -# - '499b84ac-1321-427f-aa17-267ca6975798' for Azure DevOps -# - 'https://storage.azure.com/' for storage -# Defaults to Azure DevOps -- name: resource - type: string - default: '499b84ac-1321-427f-aa17-267ca6975798' - steps: -- task: AzureCLI@2 - displayName: 'Getting federated access token for feeds' - inputs: - azureSubscription: ${{ parameters.federatedServiceConnection }} - scriptType: 'pscore' - scriptLocation: 'inlineScript' - inlineScript: | - $accessToken = az account get-access-token --query accessToken --resource ${{ parameters.resource }} --output tsv - if ($LASTEXITCODE -ne 0) { - Write-Error "Failed to get access token for resource '${{ parameters.resource }}'" - exit 1 - } - Write-Host "Setting '${{ parameters.outputVariableName }}' with the access token value" - Write-Host "##vso[task.setvariable variable=${{ parameters.outputVariableName }};issecret=true]$accessToken" +- template: /eng/common/core-templates/steps/get-federated-access-token.yml + parameters: + is1ESPipeline: true + + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} \ No newline at end of file diff --git a/eng/common/templates/job/source-build.yml b/eng/common/templates/job/source-build.yml index 4799ccac88c..e44d47b1d76 100644 --- a/eng/common/templates/job/source-build.yml +++ b/eng/common/templates/job/source-build.yml @@ -1,75 +1,7 @@ -parameters: - # This template adds arcade-powered source-build to CI. The template produces a server job with a - # default ID 'Source_Build_Complete' to put in a dependency list if necessary. - - # Specifies the prefix for source-build jobs added to pipeline. Use this if disambiguation needed. - jobNamePrefix: 'Source_Build' - - # Defines the platform on which to run the job. By default, a linux-x64 machine, suitable for - # managed-only repositories. This is an object with these properties: - # - # name: '' - # The name of the job. This is included in the job ID. - # targetRID: '' - # The name of the target RID to use, instead of the one auto-detected by Arcade. - # nonPortable: false - # Enables non-portable mode. This means a more specific RID (e.g. fedora.32-x64 rather than - # linux-x64), and compiling against distro-provided packages rather than portable ones. - # skipPublishValidation: false - # Disables publishing validation. By default, a check is performed to ensure no packages are - # published by source-build. - # container: '' - # A container to use. Runs in docker. - # pool: {} - # A pool to use. Runs directly on an agent. - # buildScript: '' - # Specifies the build script to invoke to perform the build in the repo. The default - # './build.sh' should work for typical Arcade repositories, but this is customizable for - # difficult situations. - # jobProperties: {} - # A list of job properties to inject at the top level, for potential extensibility beyond - # container and pool. - platform: {} - - # If set to true and running on a non-public project, - # Internal blob storage locations will be enabled. - # This is not enabled by default because many repositories do not need internal sources - # and do not need to have the required service connections approved in the pipeline. - enableInternalSources: false - jobs: - template: /eng/common/core-templates/job/source-build.yml parameters: is1ESPipeline: false - ${{ each property in parameters.platform.jobProperties }}: - ${{ property.key }}: ${{ property.value }} - - ${{ if ne(parameters.platform.container, '') }}: - container: ${{ parameters.platform.container }} - - ${{ if eq(parameters.platform.pool, '') }}: - # The default VM host AzDO pool. This should be capable of running Docker containers: almost all - # source-build builds run in Docker, including the default managed platform. - # /eng/common/templates/variables/pool-providers.yml can't be used here (some customers declare variables already), so duplicate its logic - pool: - ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore-Svc-Public' ), False, 'NetCore-Public')] - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open - - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')] - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 - - ${{ if ne(parameters.platform.pool, '') }}: - pool: ${{ parameters.platform.pool }} - - workspace: - clean: all - - steps: - - ${{ if eq(parameters.enableInternalSources, true) }}: - - template: /eng/common/templates/steps/enable-internal-runtimes.yml - - template: /eng/common/templates/steps/source-build.yml - parameters: - platform: ${{ parameters.platform }} + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/eng/common/templates/jobs/source-build.yml b/eng/common/templates/jobs/source-build.yml index c415255685c..818d4c326db 100644 --- a/eng/common/templates/jobs/source-build.yml +++ b/eng/common/templates/jobs/source-build.yml @@ -1,57 +1,7 @@ -parameters: - # This template adds arcade-powered source-build to CI. A job is created for each platform, as - # well as an optional server job that completes when all platform jobs complete. - - # The name of the "join" job for all source-build platforms. If set to empty string, the job is - # not included. Existing repo pipelines can use this job depend on all source-build jobs - # completing without maintaining a separate list of every single job ID: just depend on this one - # server job. By default, not included. Recommended name if used: 'Source_Build_Complete'. - allCompletedJobId: '' - - # See /eng/common/templates/job/source-build.yml - jobNamePrefix: 'Source_Build' - - # This is the default platform provided by Arcade, intended for use by a managed-only repo. - defaultManagedPlatform: - name: 'Managed' - container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8' - - # Defines the platforms on which to run build jobs. One job is created for each platform, and the - # object in this array is sent to the job template as 'platform'. If no platforms are specified, - # one job runs on 'defaultManagedPlatform'. - platforms: [] - - # If set to true and running on a non-public project, - # Internal nuget and blob storage locations will be enabled. - # This is not enabled by default because many repositories do not need internal sources - # and do not need to have the required service connections approved in the pipeline. - enableInternalSources: false - jobs: - template: /eng/common/core-templates/jobs/source-build.yml parameters: is1ESPipeline: false -- ${{ if ne(parameters.allCompletedJobId, '') }}: - - job: ${{ parameters.allCompletedJobId }} - displayName: Source-Build Complete - pool: server - dependsOn: - - ${{ each platform in parameters.platforms }}: - - ${{ parameters.jobNamePrefix }}_${{ platform.name }} - - ${{ if eq(length(parameters.platforms), 0) }}: - - ${{ parameters.jobNamePrefix }}_${{ parameters.defaultManagedPlatform.name }} - -- ${{ each platform in parameters.platforms }}: - - template: /eng/common/templates/job/source-build.yml - parameters: - jobNamePrefix: ${{ parameters.jobNamePrefix }} - platform: ${{ platform }} - enableInternalSources: ${{ parameters.enableInternalSources }} - -- ${{ if eq(length(parameters.platforms), 0) }}: - - template: /eng/common/templates/job/source-build.yml - parameters: - jobNamePrefix: ${{ parameters.jobNamePrefix }} - platform: ${{ parameters.defaultManagedPlatform }} - enableInternalSources: ${{ parameters.enableInternalSources }} + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} \ No newline at end of file diff --git a/eng/common/templates/steps/enable-internal-runtimes.yml b/eng/common/templates/steps/enable-internal-runtimes.yml index 54dc9416c51..b21a8038cc1 100644 --- a/eng/common/templates/steps/enable-internal-runtimes.yml +++ b/eng/common/templates/steps/enable-internal-runtimes.yml @@ -1,28 +1,10 @@ # Obtains internal runtime download credentials and populates the 'dotnetbuilds-internal-container-read-token-base64' # variable with the base64-encoded SAS token, by default -parameters: -- name: federatedServiceConnection - type: string - default: 'dotnetbuilds-internal-read' -- name: outputVariableName - type: string - default: 'dotnetbuilds-internal-container-read-token-base64' -- name: expiryInHours - type: number - default: 1 -- name: base64Encode - type: boolean - default: true - steps: -- ${{ if ne(variables['System.TeamProject'], 'public') }}: - - template: /eng/common/templates/steps/get-delegation-sas.yml - parameters: - federatedServiceConnection: ${{ parameters.federatedServiceConnection }} - outputVariableName: ${{ parameters.outputVariableName }} - expiryInHours: ${{ parameters.expiryInHours }} - base64Encode: ${{ parameters.base64Encode }} - storageAccount: dotnetbuilds - container: internal - permissions: rl +- template: /eng/common/core-templates/steps/enable-internal-runtimes.yml + parameters: + is1ESPipeline: false + + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/eng/common/templates/steps/get-delegation-sas.yml b/eng/common/templates/steps/get-delegation-sas.yml index c0e8f91317f..83760c9798e 100644 --- a/eng/common/templates/steps/get-delegation-sas.yml +++ b/eng/common/templates/steps/get-delegation-sas.yml @@ -1,43 +1,7 @@ -parameters: -- name: federatedServiceConnection - type: string -- name: outputVariableName - type: string -- name: expiryInHours - type: number - default: 1 -- name: base64Encode - type: boolean - default: false -- name: storageAccount - type: string -- name: container - type: string -- name: permissions - type: string - default: 'rl' - steps: -- task: AzureCLI@2 - displayName: 'Generate delegation SAS Token for ${{ parameters.storageAccount }}/${{ parameters.container }}' - inputs: - azureSubscription: ${{ parameters.federatedServiceConnection }} - scriptType: 'pscore' - scriptLocation: 'inlineScript' - inlineScript: | - # Calculate the expiration of the SAS token and convert to UTC - $expiry = (Get-Date).AddHours(${{ parameters.expiryInHours }}).ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ssZ") - - $sas = az storage container generate-sas --account-name ${{ parameters.storageAccount }} --name ${{ parameters.container }} --permissions ${{ parameters.permissions }} --expiry $expiry --auth-mode login --as-user -o tsv - - if ($LASTEXITCODE -ne 0) { - Write-Error "Failed to generate SAS token." - exit 1 - } - - if ('${{ parameters.base64Encode }}' -eq 'true') { - $sas = [Convert]::ToBase64String([System.Text.Encoding]::UTF8.GetBytes($sas)) - } +- template: /eng/common/core-templates/steps/get-delegation-sas.yml + parameters: + is1ESPipeline: false - Write-Host "Setting '${{ parameters.outputVariableName }}' with the access token value" - Write-Host "##vso[task.setvariable variable=${{ parameters.outputVariableName }};issecret=true]$sas" + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/eng/common/templates/steps/get-federated-access-token.yml b/eng/common/templates/steps/get-federated-access-token.yml index c8c49cc0e8f..31e151d9d9e 100644 --- a/eng/common/templates/steps/get-federated-access-token.yml +++ b/eng/common/templates/steps/get-federated-access-token.yml @@ -1,28 +1,7 @@ -parameters: -- name: federatedServiceConnection - type: string -- name: outputVariableName - type: string -# Resource to get a token for. Common values include: -# - '499b84ac-1321-427f-aa17-267ca6975798' for Azure DevOps -# - 'https://storage.azure.com/' for storage -# Defaults to Azure DevOps -- name: resource - type: string - default: '499b84ac-1321-427f-aa17-267ca6975798' - steps: -- task: AzureCLI@2 - displayName: 'Getting federated access token for feeds' - inputs: - azureSubscription: ${{ parameters.federatedServiceConnection }} - scriptType: 'pscore' - scriptLocation: 'inlineScript' - inlineScript: | - $accessToken = az account get-access-token --query accessToken --resource ${{ parameters.resource }} --output tsv - if ($LASTEXITCODE -ne 0) { - Write-Error "Failed to get access token for resource '${{ parameters.resource }}'" - exit 1 - } - Write-Host "Setting '${{ parameters.outputVariableName }}' with the access token value" - Write-Host "##vso[task.setvariable variable=${{ parameters.outputVariableName }};issecret=true]$accessToken" \ No newline at end of file +- template: /eng/common/core-templates/steps/get-federated-access-token.yml + parameters: + is1ESPipeline: false + + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} \ No newline at end of file From 7eb30380de54597a558789f59204ada8cb5d8e7c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 24 Jun 2024 12:46:03 +0000 Subject: [PATCH 268/568] Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20240623.1 Microsoft.CodeAnalysis.NetAnalyzers From Version 9.0.0-preview.24318.1 -> To Version 9.0.0-preview.24323.1 From f388442e97049adec4f295a72bbf6d2e11c2c37c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 24 Jun 2024 13:54:34 +0000 Subject: [PATCH 269/568] Update dependencies from https://github.com/dotnet/diagnostics build 20240621.1 (#6880) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7c7748601ce..b9d00d36e9c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore 613c1e990b6b6411bda84456aefe14fe8e194279 - + https://github.com/dotnet/diagnostics - 464e06c9a8602dff44ff5c59e9a0c3777f68e41c + 842c9603a97cf417814cf6c8d96e5c881025bf0e - + https://github.com/dotnet/diagnostics - 464e06c9a8602dff44ff5c59e9a0c3777f68e41c + 842c9603a97cf417814cf6c8d96e5c881025bf0e https://github.com/dotnet/command-line-api @@ -42,9 +42,9 @@ https://github.com/dotnet/arcade 3aba80fecac252e1cdaffcebc0a37a24a960228b - + https://github.com/dotnet/diagnostics - 464e06c9a8602dff44ff5c59e9a0c3777f68e41c + 842c9603a97cf417814cf6c8d96e5c881025bf0e https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 9488677cc7c..7cbe72b8c50 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24209.3 - 8.0.0-preview.24320.2 - 8.0.0-preview.24320.2 + 8.0.0-preview.24321.1 + 8.0.0-preview.24321.1 9.0.0-preview.24318.1 @@ -67,7 +67,7 @@ 9.0.100-preview.7.24321.3 - 1.0.532002 + 1.0.532101 $(MicrosoftNETCoreApp31Version) From 88bf4068942260919236a576e4ad308679c501b2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 24 Jun 2024 14:14:04 +0000 Subject: [PATCH 270/568] Update dependencies from https://github.com/dotnet/sdk build 20240623.5 (#6881) [feature/9.x] Update dependencies from dotnet/sdk --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b9d00d36e9c..b89af10b4b3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,9 +54,9 @@ https://github.com/dotnet/aspnetcore 613c1e990b6b6411bda84456aefe14fe8e194279 - + https://github.com/dotnet/sdk - 941ec62ab28b01b4efcab6bcdaec37b2d319b965 + ea9243f9cb36e56aba4cf6364a4d53a5c2d458fb https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 7cbe72b8c50..75eb6ec0fd5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,7 +65,7 @@ 9.0.0-preview.6.24319.11 9.0.0-preview.6.24319.11 - 9.0.100-preview.7.24321.3 + 9.0.100-preview.7.24323.5 1.0.532101 From c6e81499287f75ab4c925dc6a84c4625af695d11 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 25 Jun 2024 13:44:08 +0000 Subject: [PATCH 271/568] Update dependencies from https://github.com/dotnet/diagnostics build 20240624.2 (#6886) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 56441e99fa4..d0ddea5566c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore 613c1e990b6b6411bda84456aefe14fe8e194279 - + https://github.com/dotnet/diagnostics - 842c9603a97cf417814cf6c8d96e5c881025bf0e + f9c76c57cfa222944222cb84f2cd90505a565435 - + https://github.com/dotnet/diagnostics - 842c9603a97cf417814cf6c8d96e5c881025bf0e + f9c76c57cfa222944222cb84f2cd90505a565435 https://github.com/dotnet/command-line-api @@ -42,9 +42,9 @@ https://github.com/dotnet/arcade 3aba80fecac252e1cdaffcebc0a37a24a960228b - + https://github.com/dotnet/diagnostics - 842c9603a97cf417814cf6c8d96e5c881025bf0e + f9c76c57cfa222944222cb84f2cd90505a565435 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index cb1426bfbd0..92a740e1aca 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24209.3 - 8.0.0-preview.24321.1 - 8.0.0-preview.24321.1 + 8.0.0-preview.24324.2 + 8.0.0-preview.24324.2 9.0.0-preview.24323.1 @@ -67,7 +67,7 @@ 9.0.100-preview.7.24323.5 - 1.0.532101 + 1.0.532402 $(MicrosoftNETCoreApp31Version) From 70464307be75940a116d7ed346de7bd15e2be784 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 25 Jun 2024 13:49:16 +0000 Subject: [PATCH 272/568] Update dependencies from https://github.com/dotnet/command-line-api build 20240624.3 (#6887) [feature/9.x] Update dependencies from dotnet/command-line-api --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d0ddea5566c..851dc12dfcc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -12,9 +12,9 @@ https://github.com/dotnet/diagnostics f9c76c57cfa222944222cb84f2cd90505a565435 - + https://github.com/dotnet/command-line-api - 963d34b1fb712c673bfb198133d7e988182c9ef4 + 803d8598f98fb4efd94604b32627ee9407f246db diff --git a/eng/Versions.props b/eng/Versions.props index 92a740e1aca..79a596dfbde 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,7 +55,7 @@ 9.0.0-preview.6.24320.4 9.0.0-preview.6.24320.4 - 2.0.0-beta4.24209.3 + 2.0.0-beta4.24324.3 8.0.0-preview.24324.2 8.0.0-preview.24324.2 From 92e2b1e13fdb818e803a33bfdfb6457ecda42b34 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 25 Jun 2024 14:04:39 +0000 Subject: [PATCH 273/568] Update dependencies from https://github.com/dotnet/arcade build 20240624.8 (#6888) [feature/9.x] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- global.json | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 851dc12dfcc..5ffef98a49e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,25 +22,25 @@ https://github.com/dotnet/roslyn-analyzers f1115edce8633ebe03a86191bc05c6969ed9a821 - + https://github.com/dotnet/arcade - 3aba80fecac252e1cdaffcebc0a37a24a960228b + 79f0a2e647b3dcec3a88dcdcb9037736c21fe965 - + https://github.com/dotnet/arcade - 3aba80fecac252e1cdaffcebc0a37a24a960228b + 79f0a2e647b3dcec3a88dcdcb9037736c21fe965 - + https://github.com/dotnet/arcade - 3aba80fecac252e1cdaffcebc0a37a24a960228b + 79f0a2e647b3dcec3a88dcdcb9037736c21fe965 - + https://github.com/dotnet/arcade - 3aba80fecac252e1cdaffcebc0a37a24a960228b + 79f0a2e647b3dcec3a88dcdcb9037736c21fe965 - + https://github.com/dotnet/arcade - 3aba80fecac252e1cdaffcebc0a37a24a960228b + 79f0a2e647b3dcec3a88dcdcb9037736c21fe965 https://github.com/dotnet/diagnostics diff --git a/eng/Versions.props b/eng/Versions.props index 79a596dfbde..65097dd4ba0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,9 +48,9 @@ --> - 9.0.0-beta.24321.4 - 9.0.0-beta.24321.4 - 9.0.0-beta.24321.4 + 9.0.0-beta.24324.8 + 9.0.0-beta.24324.8 + 9.0.0-beta.24324.8 9.0.0-preview.6.24320.4 9.0.0-preview.6.24320.4 diff --git a/global.json b/global.json index f665abe46e8..8247fe29b11 100644 --- a/global.json +++ b/global.json @@ -31,7 +31,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24321.4", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24321.4" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24324.8", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24324.8" } } From 7e917b7635a7e731bcd8bd2a3445a6ca0801ccee Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 27 Jun 2024 09:05:27 -0700 Subject: [PATCH 274/568] [feature/9.x] Update dependencies from dotnet/diagnostics (#6894) * Update dependencies from https://github.com/dotnet/diagnostics build 20240625.1 Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe , Microsoft.FileFormats From Version 8.0.0-preview.24324.2 -> To Version 8.0.0-preview.24325.1 * Update dependencies from https://github.com/dotnet/diagnostics build 20240626.1 Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe , Microsoft.FileFormats From Version 8.0.0-preview.24324.2 -> To Version 8.0.0-preview.24326.1 --------- Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5ffef98a49e..1bdab896d38 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore 613c1e990b6b6411bda84456aefe14fe8e194279 - + https://github.com/dotnet/diagnostics - f9c76c57cfa222944222cb84f2cd90505a565435 + 24e70219872cf1f46c9e291bf110ee4baf9c9ba8 - + https://github.com/dotnet/diagnostics - f9c76c57cfa222944222cb84f2cd90505a565435 + 24e70219872cf1f46c9e291bf110ee4baf9c9ba8 https://github.com/dotnet/command-line-api @@ -42,9 +42,9 @@ https://github.com/dotnet/arcade 79f0a2e647b3dcec3a88dcdcb9037736c21fe965 - + https://github.com/dotnet/diagnostics - f9c76c57cfa222944222cb84f2cd90505a565435 + 24e70219872cf1f46c9e291bf110ee4baf9c9ba8 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 65097dd4ba0..6333316092a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24324.3 - 8.0.0-preview.24324.2 - 8.0.0-preview.24324.2 + 8.0.0-preview.24326.1 + 8.0.0-preview.24326.1 9.0.0-preview.24323.1 @@ -67,7 +67,7 @@ 9.0.100-preview.7.24323.5 - 1.0.532402 + 1.0.532601 $(MicrosoftNETCoreApp31Version) From ace2d3a053c71a0ded933c468c56116acf93a063 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 27 Jun 2024 09:05:38 -0700 Subject: [PATCH 275/568] [feature/9.x] Update dependencies from dotnet/roslyn-analyzers (#6891) * Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20240624.1 Microsoft.CodeAnalysis.NetAnalyzers From Version 9.0.0-preview.24323.1 -> To Version 9.0.0-preview.24324.1 * Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20240624.1 Microsoft.CodeAnalysis.NetAnalyzers From Version 9.0.0-preview.24323.1 -> To Version 9.0.0-preview.24324.1 * Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20240624.1 Microsoft.CodeAnalysis.NetAnalyzers From Version 9.0.0-preview.24323.1 -> To Version 9.0.0-preview.24324.1 --------- Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1bdab896d38..a446416a731 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -18,9 +18,9 @@ - + https://github.com/dotnet/roslyn-analyzers - f1115edce8633ebe03a86191bc05c6969ed9a821 + 43709af7570da7140fb3e9a5237f55ffb24677e7 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 6333316092a..e07874c70ea 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -60,7 +60,7 @@ 8.0.0-preview.24326.1 8.0.0-preview.24326.1 - 9.0.0-preview.24323.1 + 9.0.0-preview.24324.1 9.0.0-preview.6.24319.11 9.0.0-preview.6.24319.11 From 535aa9feef87ceff33f5b79c81ccacc9819738eb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 27 Jun 2024 09:06:27 -0700 Subject: [PATCH 276/568] [feature/9.x] Update dependencies from dotnet/arcade (#6895) * Update dependencies from https://github.com/dotnet/arcade build 20240626.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.24324.8 -> To Version 9.0.0-beta.24326.1 * Update dependencies from https://github.com/dotnet/arcade build 20240627.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.24324.8 -> To Version 9.0.0-beta.24327.1 --------- Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 20 +++++++++---------- eng/Versions.props | 6 +++--- .../job/publish-build-assets.yml | 7 +++++-- .../steps/enable-internal-sources.yml | 4 +++- eng/common/dotnet-install.sh | 3 +++ eng/common/native/CommonLibrary.psm1 | 3 ++- global.json | 4 ++-- 7 files changed, 28 insertions(+), 19 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a446416a731..31b64fda605 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,25 +22,25 @@ https://github.com/dotnet/roslyn-analyzers 43709af7570da7140fb3e9a5237f55ffb24677e7 - + https://github.com/dotnet/arcade - 79f0a2e647b3dcec3a88dcdcb9037736c21fe965 + ede13bd35571c0c8b0c01edcb057031904c5c955 - + https://github.com/dotnet/arcade - 79f0a2e647b3dcec3a88dcdcb9037736c21fe965 + ede13bd35571c0c8b0c01edcb057031904c5c955 - + https://github.com/dotnet/arcade - 79f0a2e647b3dcec3a88dcdcb9037736c21fe965 + ede13bd35571c0c8b0c01edcb057031904c5c955 - + https://github.com/dotnet/arcade - 79f0a2e647b3dcec3a88dcdcb9037736c21fe965 + ede13bd35571c0c8b0c01edcb057031904c5c955 - + https://github.com/dotnet/arcade - 79f0a2e647b3dcec3a88dcdcb9037736c21fe965 + ede13bd35571c0c8b0c01edcb057031904c5c955 https://github.com/dotnet/diagnostics diff --git a/eng/Versions.props b/eng/Versions.props index e07874c70ea..3ec274153c2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,9 +48,9 @@ --> - 9.0.0-beta.24324.8 - 9.0.0-beta.24324.8 - 9.0.0-beta.24324.8 + 9.0.0-beta.24327.1 + 9.0.0-beta.24327.1 + 9.0.0-beta.24327.1 9.0.0-preview.6.24320.4 9.0.0-preview.6.24320.4 diff --git a/eng/common/core-templates/job/publish-build-assets.yml b/eng/common/core-templates/job/publish-build-assets.yml index 2cf8e1853d0..d99a1a3b284 100644 --- a/eng/common/core-templates/job/publish-build-assets.yml +++ b/eng/common/core-templates/job/publish-build-assets.yml @@ -155,10 +155,13 @@ jobs: PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} is1ESPipeline: ${{ parameters.is1ESPipeline }} - - task: PowerShell@2 + - task: AzureCLI@2 displayName: Publish Using Darc inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 + azureSubscription: "Darc: Maestro Production" + scriptType: ps + scriptLocation: scriptPath + scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 arguments: -BuildId $(BARBuildId) -PublishingInfraVersion 3 -AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)' diff --git a/eng/common/core-templates/steps/enable-internal-sources.yml b/eng/common/core-templates/steps/enable-internal-sources.yml index 4a06b529082..64f881bffc3 100644 --- a/eng/common/core-templates/steps/enable-internal-sources.yml +++ b/eng/common/core-templates/steps/enable-internal-sources.yml @@ -18,7 +18,9 @@ steps: displayName: Setup Internal Feeds inputs: filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 - arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config + arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token + env: + Token: ${{ parameters.legacyCredential }} # If running on dnceng (internal project), just use the default behavior for NuGetAuthenticate. # If running on DevDiv, NuGetAuthenticate is not really an option. It's scoped to a single feed, and we have many feeds that # may be added. Instead, we'll use the traditional approach (add cred to nuget.config), but use an account token. diff --git a/eng/common/dotnet-install.sh b/eng/common/dotnet-install.sh index a2fba470380..7b9d97e3bd4 100755 --- a/eng/common/dotnet-install.sh +++ b/eng/common/dotnet-install.sh @@ -71,6 +71,9 @@ case $cpuname in i[3-6]86) buildarch=x86 ;; + riscv64) + buildarch=riscv64 + ;; *) echo "Unknown CPU $cpuname detected, treating it as x64" buildarch=x64 diff --git a/eng/common/native/CommonLibrary.psm1 b/eng/common/native/CommonLibrary.psm1 index ca38268c44d..f71f6af6cdb 100644 --- a/eng/common/native/CommonLibrary.psm1 +++ b/eng/common/native/CommonLibrary.psm1 @@ -277,7 +277,8 @@ function Get-MachineArchitecture { if (($ProcessorArchitecture -Eq "AMD64") -Or ($ProcessorArchitecture -Eq "IA64") -Or ($ProcessorArchitecture -Eq "ARM64") -Or - ($ProcessorArchitecture -Eq "LOONGARCH64")) { + ($ProcessorArchitecture -Eq "LOONGARCH64") -Or + ($ProcessorArchitecture -Eq "RISCV64")) { return "x64" } return "x86" diff --git a/global.json b/global.json index 8247fe29b11..5f91d176963 100644 --- a/global.json +++ b/global.json @@ -31,7 +31,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24324.8", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24324.8" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24327.1", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24327.1" } } From a8f38afd17fce098e4a3fc9df65f6cfb883752ed Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 28 Jun 2024 17:41:24 +0000 Subject: [PATCH 277/568] Update dependencies from https://github.com/dotnet/diagnostics build 20240627.1 (#6901) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 31b64fda605..adee9ae1328 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore 613c1e990b6b6411bda84456aefe14fe8e194279 - + https://github.com/dotnet/diagnostics - 24e70219872cf1f46c9e291bf110ee4baf9c9ba8 + e009bfe09b92ef8d2064c4103f3cac85915b3ceb - + https://github.com/dotnet/diagnostics - 24e70219872cf1f46c9e291bf110ee4baf9c9ba8 + e009bfe09b92ef8d2064c4103f3cac85915b3ceb https://github.com/dotnet/command-line-api @@ -42,9 +42,9 @@ https://github.com/dotnet/arcade ede13bd35571c0c8b0c01edcb057031904c5c955 - + https://github.com/dotnet/diagnostics - 24e70219872cf1f46c9e291bf110ee4baf9c9ba8 + e009bfe09b92ef8d2064c4103f3cac85915b3ceb https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 3ec274153c2..1184a781505 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24324.3 - 8.0.0-preview.24326.1 - 8.0.0-preview.24326.1 + 8.0.0-preview.24327.1 + 8.0.0-preview.24327.1 9.0.0-preview.24324.1 @@ -67,7 +67,7 @@ 9.0.100-preview.7.24323.5 - 1.0.532601 + 1.0.532701 $(MicrosoftNETCoreApp31Version) From 42545ba85eb79eb9d2da115a10ec6f60002117ff Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 29 Jun 2024 14:08:42 +0000 Subject: [PATCH 278/568] Update dependencies from https://github.com/dotnet/sdk build 20240628.18 (#6910) [feature/9.x] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Runtime.win-x64: from 9.0.0-preview.6.24320.4 to 9.0.0-preview.7.24321.1 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) - Microsoft.NETCore.App.Runtime.win-x64: from 9.0.0-preview.6.24319.11 to 9.0.0-preview.7.24327.11 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) - VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0: from 9.0.0-preview.6.24320.4 to 9.0.0-preview.7.24321.1 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) - VS.Redist.Common.NetCore.SharedFramework.x64.9.0: from 9.0.0-preview.6.24319.11 to 9.0.0-preview.7.24327.11 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index adee9ae1328..1171dc20812 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/aspnetcore - 613c1e990b6b6411bda84456aefe14fe8e194279 + 28481ab0d6a31883a6c058d045ca8f72591a7eca https://github.com/dotnet/diagnostics @@ -46,21 +46,21 @@ https://github.com/dotnet/diagnostics e009bfe09b92ef8d2064c4103f3cac85915b3ceb - + https://github.com/dotnet/runtime - 117cfccdd71abc164e6b933ca7602b509a1365dd + d88e6680e1f9e2cb4f5ee428aa169ab715158eab - + https://github.com/dotnet/aspnetcore - 613c1e990b6b6411bda84456aefe14fe8e194279 + 28481ab0d6a31883a6c058d045ca8f72591a7eca - + https://github.com/dotnet/sdk - ea9243f9cb36e56aba4cf6364a4d53a5c2d458fb + a6b5d017d4aadcb5cc2bc21352c6e83c559b26d6 - + https://github.com/dotnet/runtime - 117cfccdd71abc164e6b933ca7602b509a1365dd + d88e6680e1f9e2cb4f5ee428aa169ab715158eab diff --git a/eng/Versions.props b/eng/Versions.props index 1184a781505..79ea6942a99 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,8 +52,8 @@ 9.0.0-beta.24327.1 9.0.0-beta.24327.1 - 9.0.0-preview.6.24320.4 - 9.0.0-preview.6.24320.4 + 9.0.0-preview.7.24321.1 + 9.0.0-preview.7.24321.1 2.0.0-beta4.24324.3 @@ -62,10 +62,10 @@ 9.0.0-preview.24324.1 - 9.0.0-preview.6.24319.11 - 9.0.0-preview.6.24319.11 + 9.0.0-preview.7.24327.11 + 9.0.0-preview.7.24327.11 - 9.0.100-preview.7.24323.5 + 9.0.100-preview.7.24328.18 1.0.532701 From 5f0e8eb2ada22016c4ace7401d0f441a27eaef4b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 30 Jun 2024 13:30:12 +0000 Subject: [PATCH 279/568] Update dependencies from https://github.com/dotnet/diagnostics build 20240628.1 (#6912) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1171dc20812..5f4e0ac3e51 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore 28481ab0d6a31883a6c058d045ca8f72591a7eca - + https://github.com/dotnet/diagnostics - e009bfe09b92ef8d2064c4103f3cac85915b3ceb + 36353b20e53e0c4af482e4fbe1d0a572515f14a2 - + https://github.com/dotnet/diagnostics - e009bfe09b92ef8d2064c4103f3cac85915b3ceb + 36353b20e53e0c4af482e4fbe1d0a572515f14a2 https://github.com/dotnet/command-line-api @@ -42,9 +42,9 @@ https://github.com/dotnet/arcade ede13bd35571c0c8b0c01edcb057031904c5c955 - + https://github.com/dotnet/diagnostics - e009bfe09b92ef8d2064c4103f3cac85915b3ceb + 36353b20e53e0c4af482e4fbe1d0a572515f14a2 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 79ea6942a99..8b5dd6dc19d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24324.3 - 8.0.0-preview.24327.1 - 8.0.0-preview.24327.1 + 8.0.0-preview.24328.1 + 8.0.0-preview.24328.1 9.0.0-preview.24324.1 @@ -67,7 +67,7 @@ 9.0.100-preview.7.24328.18 - 1.0.532701 + 1.0.532801 $(MicrosoftNETCoreApp31Version) From 213972fcee6d83c2e81291095fec2480feb4bc0d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 30 Jun 2024 14:29:52 +0000 Subject: [PATCH 280/568] Update dependencies from https://github.com/dotnet/sdk build 20240629.1 (#6913) [feature/9.x] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Runtime.win-x64: from 9.0.0-preview.7.24321.1 to 9.0.0-preview.7.24328.7 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) - VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0: from 9.0.0-preview.7.24321.1 to 9.0.0-preview.7.24328.7 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5f4e0ac3e51..bc22aa8a2ab 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/aspnetcore - 28481ab0d6a31883a6c058d045ca8f72591a7eca + 77994c64cee73e0093fe25cd434bee8bd2580b4e https://github.com/dotnet/diagnostics @@ -50,13 +50,13 @@ https://github.com/dotnet/runtime d88e6680e1f9e2cb4f5ee428aa169ab715158eab - + https://github.com/dotnet/aspnetcore - 28481ab0d6a31883a6c058d045ca8f72591a7eca + 77994c64cee73e0093fe25cd434bee8bd2580b4e - + https://github.com/dotnet/sdk - a6b5d017d4aadcb5cc2bc21352c6e83c559b26d6 + a081e8d8cdcce5cb0b0329cf68cf190060e870a6 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 8b5dd6dc19d..ba5edd9fc56 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,8 +52,8 @@ 9.0.0-beta.24327.1 9.0.0-beta.24327.1 - 9.0.0-preview.7.24321.1 - 9.0.0-preview.7.24321.1 + 9.0.0-preview.7.24328.7 + 9.0.0-preview.7.24328.7 2.0.0-beta4.24324.3 @@ -65,7 +65,7 @@ 9.0.0-preview.7.24327.11 9.0.0-preview.7.24327.11 - 9.0.100-preview.7.24328.18 + 9.0.100-preview.7.24329.1 1.0.532801 From fd08b35b6ba6079a6082b97bad60acbf1eab8f08 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 1 Jul 2024 00:08:45 +0000 Subject: [PATCH 281/568] Restore branch-specific files --- .../job/publish-build-assets.yml | 124 +------------ .../post-build/post-build.yml | 174 +----------------- .../templates/job/publish-build-assets.yml | 120 +----------- .../templates/post-build/post-build.yml | 173 +---------------- .../post-build/setup-maestro-vars.yml | 59 +----- 5 files changed, 10 insertions(+), 640 deletions(-) diff --git a/eng/common/templates-official/job/publish-build-assets.yml b/eng/common/templates-official/job/publish-build-assets.yml index 9ea50856209..d667a70e8de 100644 --- a/eng/common/templates-official/job/publish-build-assets.yml +++ b/eng/common/templates-official/job/publish-build-assets.yml @@ -3,125 +3,5 @@ jobs: parameters: is1ESPipeline: true - dependsOn: ${{ parameters.dependsOn }} - timeoutInMinutes: 150 - - ${{ if eq(parameters.publishAssetsImmediately, 'true') }}: - displayName: Publish Assets - ${{ else }}: - displayName: Publish to Build Asset Registry - - variables: - - template: /eng/common/templates-official/variables/pool-providers.yml - - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - group: Publish-Build-Assets - - group: AzureDevOps-Artifact-Feeds-Pats - - name: runCodesignValidationInjection - value: false - - ${{ if eq(parameters.publishAssetsImmediately, 'true') }}: - - template: /eng/common/templates-official/post-build/common-variables.yml - - pool: - # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) - ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: - name: AzurePipelines-EO - image: 1ESPT-Windows2022 - demands: Cmd - os: windows - # If it's not devdiv, it's dnceng - ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: - name: NetCore1ESPool-Publishing-Internal - image: windows.vs2019.amd64 - os: windows - steps: - - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - task: DownloadBuildArtifacts@0 - displayName: Download artifact - inputs: - artifactName: AssetManifests - downloadPath: '$(Build.StagingDirectory)/Download' - checkDownloadedFiles: true - condition: ${{ parameters.condition }} - continueOnError: ${{ parameters.continueOnError }} - - - task: NuGetAuthenticate@1 - - - task: AzureCLI@2 - displayName: Publish Build Assets - inputs: - azureSubscription: "Darc: Maestro Production" - scriptType: ps - scriptLocation: scriptPath - scriptPath: $(Build.SourcesDirectory)/eng/common/sdk-task.ps1 - arguments: > - -task PublishBuildAssets -restore -msbuildEngine dotnet - /p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests' - /p:MaestroApiEndpoint=https://maestro-prod.westus2.cloudapp.azure.com - /p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }} - /p:OfficialBuildId=$(Build.BuildNumber) - condition: ${{ parameters.condition }} - continueOnError: ${{ parameters.continueOnError }} - - - task: powershell@2 - displayName: Create ReleaseConfigs Artifact - inputs: - targetType: inline - script: | - New-Item -Path "$(Build.StagingDirectory)/ReleaseConfigs" -ItemType Directory -Force - $filePath = "$(Build.StagingDirectory)/ReleaseConfigs/ReleaseConfigs.txt" - Add-Content -Path $filePath -Value $(BARBuildId) - Add-Content -Path $filePath -Value "$(DefaultChannels)" - Add-Content -Path $filePath -Value $(IsStableBuild) - - - task: 1ES.PublishBuildArtifacts@1 - displayName: Publish ReleaseConfigs Artifact - inputs: - PathtoPublish: '$(Build.StagingDirectory)/ReleaseConfigs' - PublishLocation: Container - ArtifactName: ReleaseConfigs - - - task: powershell@2 - displayName: Check if SymbolPublishingExclusionsFile.txt exists - inputs: - targetType: inline - script: | - $symbolExclusionfile = "$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt" - if(Test-Path -Path $symbolExclusionfile) - { - Write-Host "SymbolExclusionFile exists" - Write-Host "##vso[task.setvariable variable=SymbolExclusionFile]true" - } - else{ - Write-Host "Symbols Exclusion file does not exists" - Write-Host "##vso[task.setvariable variable=SymbolExclusionFile]false" - } - - - task: 1ES.PublishBuildArtifacts@1 - displayName: Publish SymbolPublishingExclusionsFile Artifact - condition: eq(variables['SymbolExclusionFile'], 'true') - inputs: - PathtoPublish: '$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' - PublishLocation: Container - ArtifactName: ReleaseConfigs - - - ${{ if eq(parameters.publishAssetsImmediately, 'true') }}: - - template: /eng/common/templates-official/post-build/setup-maestro-vars.yml - parameters: - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - - - task: PowerShell@2 - displayName: Publish Using Darc - inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 - arguments: -BuildId $(BARBuildId) - -PublishingInfraVersion 3 - -AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)' - -WaitPublishingFinish true - -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' - -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' - - - ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}: - - template: /eng/common/templates-official/steps/publish-logs.yml - parameters: - JobLabel: 'Publish_Artifacts_Logs' + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/eng/common/templates-official/post-build/post-build.yml b/eng/common/templates-official/post-build/post-build.yml index 563484310aa..2364c0fd4a5 100644 --- a/eng/common/templates-official/post-build/post-build.yml +++ b/eng/common/templates-official/post-build/post-build.yml @@ -4,175 +4,5 @@ stages: # Specifies whether to use 1ES is1ESPipeline: true - steps: - - template: setup-maestro-vars.yml - parameters: - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - - - task: DownloadBuildArtifacts@0 - displayName: Download Package Artifacts - inputs: - buildType: specific - buildVersionToDownload: specific - project: $(AzDOProjectName) - pipeline: $(AzDOPipelineId) - buildId: $(AzDOBuildId) - artifactName: PackageArtifacts - checkDownloadedFiles: true - - - task: PowerShell@2 - displayName: Validate - inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/nuget-validation.ps1 - arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ - -ToolDestinationPath $(Agent.BuildDirectory)/Extract/ - - - job: - displayName: Signing Validation - condition: and( eq( ${{ parameters.enableSigningValidation }}, 'true'), ne( variables['PostBuildSign'], 'true')) - pool: - # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) - ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: - name: AzurePipelines-EO - image: 1ESPT-Windows2022 - demands: Cmd - os: windows - # If it's not devdiv, it's dnceng - ${{ else }}: - name: $(DncEngInternalBuildPool) - image: 1es-windows-2022 - os: windows - steps: - - template: setup-maestro-vars.yml - parameters: - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - - - task: DownloadBuildArtifacts@0 - displayName: Download Package Artifacts - inputs: - buildType: specific - buildVersionToDownload: specific - project: $(AzDOProjectName) - pipeline: $(AzDOPipelineId) - buildId: $(AzDOBuildId) - artifactName: PackageArtifacts - checkDownloadedFiles: true - itemPattern: | - ** - !**/Microsoft.SourceBuild.Intermediate.*.nupkg - - # 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@1 - displayName: 'Authenticate to AzDO Feeds' - - # Signing validation will optionally work with the buildmanifest file which is downloaded from - # Azure DevOps above. - - task: PowerShell@2 - displayName: Validate - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task SigningValidation -restore -msbuildEngine vs - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts' - /p:SignCheckExclusionsFile='$(Build.SourcesDirectory)/eng/SignCheckExclusionsFile.txt' - ${{ parameters.signingValidationAdditionalParameters }} - - - template: ../steps/publish-logs.yml - parameters: - StageLabel: 'Validation' - JobLabel: 'Signing' - BinlogToolVersion: $(BinlogToolVersion) - - - job: - displayName: SourceLink Validation - condition: eq( ${{ parameters.enableSourceLinkValidation }}, 'true') - pool: - # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) - ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: - name: AzurePipelines-EO - image: 1ESPT-Windows2022 - demands: Cmd - os: windows - # If it's not devdiv, it's dnceng - ${{ else }}: - name: $(DncEngInternalBuildPool) - image: 1es-windows-2022 - os: windows - steps: - - template: setup-maestro-vars.yml - parameters: - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - buildType: specific - buildVersionToDownload: specific - project: $(AzDOProjectName) - pipeline: $(AzDOPipelineId) - buildId: $(AzDOBuildId) - artifactName: BlobArtifacts - checkDownloadedFiles: true - - - task: PowerShell@2 - displayName: Validate - inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/sourcelink-validation.ps1 - arguments: -InputPath $(Build.ArtifactStagingDirectory)/BlobArtifacts/ - -ExtractPath $(Agent.BuildDirectory)/Extract/ - -GHRepoName $(Build.Repository.Name) - -GHCommit $(Build.SourceVersion) - -SourcelinkCliVersion $(SourceLinkCLIVersion) - continueOnError: true - -- ${{ if ne(parameters.publishAssetsImmediately, 'true') }}: - - stage: publish_using_darc - ${{ if or(eq(parameters.enableNugetValidation, 'true'), eq(parameters.enableSigningValidation, 'true'), eq(parameters.enableSourceLinkValidation, 'true'), eq(parameters.SDLValidationParameters.enable, 'true')) }}: - dependsOn: ${{ parameters.publishDependsOn }} - ${{ else }}: - dependsOn: ${{ parameters.validateDependsOn }} - displayName: Publish using Darc - variables: - - template: common-variables.yml - - template: /eng/common/templates-official/variables/pool-providers.yml - jobs: - - job: - displayName: Publish Using Darc - timeoutInMinutes: 120 - pool: - # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) - ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: - name: AzurePipelines-EO - image: 1ESPT-Windows2022 - demands: Cmd - os: windows - # If it's not devdiv, it's dnceng - ${{ else }}: - name: NetCore1ESPool-Publishing-Internal - image: windows.vs2019.amd64 - os: windows - steps: - - template: setup-maestro-vars.yml - parameters: - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - - - task: NuGetAuthenticate@1 - - - task: AzureCLI@2 - displayName: Publish Using Darc - inputs: - azureSubscription: "Darc: Maestro Production" - scriptType: ps - scriptLocation: scriptPath - scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 - arguments: -BuildId $(BARBuildId) - -PublishingInfraVersion ${{ parameters.publishingInfraVersion }} - -AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)' - -WaitPublishingFinish true - -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' - -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml index 604856e2bb5..ab2edec2adb 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -3,121 +3,5 @@ jobs: parameters: is1ESPipeline: false - dependsOn: ${{ parameters.dependsOn }} - timeoutInMinutes: 150 - - ${{ if eq(parameters.publishAssetsImmediately, 'true') }}: - displayName: Publish Assets - ${{ else }}: - displayName: Publish to Build Asset Registry - - variables: - - template: /eng/common/templates/variables/pool-providers.yml - - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - group: Publish-Build-Assets - - group: AzureDevOps-Artifact-Feeds-Pats - - name: runCodesignValidationInjection - value: false - - ${{ if eq(parameters.publishAssetsImmediately, 'true') }}: - - template: /eng/common/templates/post-build/common-variables.yml - - pool: - # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) - ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: - name: VSEngSS-MicroBuild2022-1ES - demands: Cmd - # If it's not devdiv, it's dnceng - ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: - name: NetCore1ESPool-Publishing-Internal - demands: ImageOverride -equals windows.vs2019.amd64 - - steps: - - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - task: DownloadBuildArtifacts@0 - displayName: Download artifact - inputs: - artifactName: AssetManifests - downloadPath: '$(Build.StagingDirectory)/Download' - checkDownloadedFiles: true - condition: ${{ parameters.condition }} - continueOnError: ${{ parameters.continueOnError }} - - - task: NuGetAuthenticate@1 - - - task: AzureCLI@2 - displayName: Publish Build Assets - inputs: - azureSubscription: "Darc: Maestro Production" - scriptType: ps - scriptLocation: scriptPath - scriptPath: $(Build.SourcesDirectory)/eng/common/sdk-task.ps1 - arguments: > - -task PublishBuildAssets -restore -msbuildEngine dotnet - /p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests' - /p:MaestroApiEndpoint=https://maestro.dot.net - /p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }} - /p:OfficialBuildId=$(Build.BuildNumber) - condition: ${{ parameters.condition }} - continueOnError: ${{ parameters.continueOnError }} - - - task: powershell@2 - displayName: Create ReleaseConfigs Artifact - inputs: - targetType: inline - script: | - Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value $(BARBuildId) - Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value "$(DefaultChannels)" - Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value $(IsStableBuild) - - - task: PublishBuildArtifacts@1 - displayName: Publish ReleaseConfigs Artifact - inputs: - PathtoPublish: '$(Build.StagingDirectory)/ReleaseConfigs.txt' - PublishLocation: Container - ArtifactName: ReleaseConfigs - - - task: powershell@2 - displayName: Check if SymbolPublishingExclusionsFile.txt exists - inputs: - targetType: inline - script: | - $symbolExclusionfile = "$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt" - if(Test-Path -Path $symbolExclusionfile) - { - Write-Host "SymbolExclusionFile exists" - Write-Host "##vso[task.setvariable variable=SymbolExclusionFile]true" - } - else{ - Write-Host "Symbols Exclusion file does not exists" - Write-Host "##vso[task.setvariable variable=SymbolExclusionFile]false" - } - - - task: PublishBuildArtifacts@1 - displayName: Publish SymbolPublishingExclusionsFile Artifact - condition: eq(variables['SymbolExclusionFile'], 'true') - inputs: - PathtoPublish: '$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' - PublishLocation: Container - ArtifactName: ReleaseConfigs - - - ${{ if eq(parameters.publishAssetsImmediately, 'true') }}: - - template: /eng/common/templates/post-build/setup-maestro-vars.yml - parameters: - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - - - task: PowerShell@2 - displayName: Publish Using Darc - inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 - arguments: -BuildId $(BARBuildId) - -PublishingInfraVersion 3 - -AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)' - -WaitPublishingFinish true - -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' - -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' - - - ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}: - - template: /eng/common/templates/steps/publish-logs.yml - parameters: - JobLabel: 'Publish_Artifacts_Logs' + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index 732b91b12ae..53ede714bdd 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -4,174 +4,5 @@ stages: # Specifies whether to use 1ES is1ESPipeline: false - steps: - - template: setup-maestro-vars.yml - parameters: - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - - - task: DownloadBuildArtifacts@0 - displayName: Download Package Artifacts - inputs: - buildType: specific - buildVersionToDownload: specific - project: $(AzDOProjectName) - pipeline: $(AzDOPipelineId) - buildId: $(AzDOBuildId) - artifactName: PackageArtifacts - checkDownloadedFiles: true - - - task: PowerShell@2 - displayName: Validate - inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/nuget-validation.ps1 - arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ - -ToolDestinationPath $(Agent.BuildDirectory)/Extract/ - - - job: - displayName: Signing Validation - condition: and( eq( ${{ parameters.enableSigningValidation }}, 'true'), ne( variables['PostBuildSign'], 'true')) - pool: - # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) - ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: - name: VSEngSS-MicroBuild2022-1ES - demands: Cmd - # If it's not devdiv, it's dnceng - ${{ else }}: - name: $(DncEngInternalBuildPool) - demands: ImageOverride -equals windows.vs2019.amd64 - steps: - - template: setup-maestro-vars.yml - parameters: - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - - - task: DownloadBuildArtifacts@0 - displayName: Download Package Artifacts - inputs: - buildType: specific - buildVersionToDownload: specific - project: $(AzDOProjectName) - pipeline: $(AzDOPipelineId) - buildId: $(AzDOBuildId) - artifactName: PackageArtifacts - checkDownloadedFiles: true - itemPattern: | - ** - !**/Microsoft.SourceBuild.Intermediate.*.nupkg - - # 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@1 - displayName: 'Authenticate to AzDO Feeds' - - # Signing validation will optionally work with the buildmanifest file which is downloaded from - # Azure DevOps above. - - task: PowerShell@2 - displayName: Validate - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task SigningValidation -restore -msbuildEngine vs - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts' - /p:SignCheckExclusionsFile='$(Build.SourcesDirectory)/eng/SignCheckExclusionsFile.txt' - ${{ parameters.signingValidationAdditionalParameters }} - - - template: ../steps/publish-logs.yml - parameters: - StageLabel: 'Validation' - JobLabel: 'Signing' - - - job: - displayName: SourceLink Validation - condition: eq( ${{ parameters.enableSourceLinkValidation }}, 'true') - pool: - # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) - ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: - name: VSEngSS-MicroBuild2022-1ES - demands: Cmd - # If it's not devdiv, it's dnceng - ${{ else }}: - name: $(DncEngInternalBuildPool) - demands: ImageOverride -equals windows.vs2019.amd64 - steps: - - template: setup-maestro-vars.yml - parameters: - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - buildType: specific - buildVersionToDownload: specific - project: $(AzDOProjectName) - pipeline: $(AzDOPipelineId) - buildId: $(AzDOBuildId) - artifactName: BlobArtifacts - checkDownloadedFiles: true - - - task: PowerShell@2 - displayName: Validate - inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/sourcelink-validation.ps1 - arguments: -InputPath $(Build.ArtifactStagingDirectory)/BlobArtifacts/ - -ExtractPath $(Agent.BuildDirectory)/Extract/ - -GHRepoName $(Build.Repository.Name) - -GHCommit $(Build.SourceVersion) - -SourcelinkCliVersion $(SourceLinkCLIVersion) - continueOnError: true - - - template: /eng/common/templates/job/execute-sdl.yml - parameters: - enable: ${{ parameters.SDLValidationParameters.enable }} - publishGuardianDirectoryToPipeline: ${{ parameters.SDLValidationParameters.publishGdn }} - additionalParameters: ${{ parameters.SDLValidationParameters.params }} - continueOnError: ${{ parameters.SDLValidationParameters.continueOnError }} - artifactNames: ${{ parameters.SDLValidationParameters.artifactNames }} - downloadArtifacts: ${{ parameters.SDLValidationParameters.downloadArtifacts }} - -- ${{ if ne(parameters.publishAssetsImmediately, 'true') }}: - - stage: publish_using_darc - ${{ if or(eq(parameters.enableNugetValidation, 'true'), eq(parameters.enableSigningValidation, 'true'), eq(parameters.enableSourceLinkValidation, 'true'), eq(parameters.SDLValidationParameters.enable, 'true')) }}: - dependsOn: ${{ parameters.publishDependsOn }} - ${{ else }}: - dependsOn: ${{ parameters.validateDependsOn }} - displayName: Publish using Darc - variables: - - template: common-variables.yml - - template: /eng/common/templates/variables/pool-providers.yml - jobs: - - job: - displayName: Publish Using Darc - timeoutInMinutes: 120 - pool: - # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) - ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: - name: VSEngSS-MicroBuild2022-1ES - demands: Cmd - # If it's not devdiv, it's dnceng - ${{ else }}: - name: NetCore1ESPool-Publishing-Internal - demands: ImageOverride -equals windows.vs2019.amd64 - steps: - - template: setup-maestro-vars.yml - parameters: - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - - - task: NuGetAuthenticate@1 - - - task: AzureCLI@2 - displayName: Publish Using Darc - inputs: - azureSubscription: "Darc: Maestro Production" - scriptType: ps - scriptLocation: scriptPath - scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 - arguments: -BuildId $(BARBuildId) - -PublishingInfraVersion ${{ parameters.publishingInfraVersion }} - -AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)' - -WaitPublishingFinish true - -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' - -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} \ No newline at end of file diff --git a/eng/common/templates/post-build/setup-maestro-vars.yml b/eng/common/templates/post-build/setup-maestro-vars.yml index df06c91d4e3..a79fab5b441 100644 --- a/eng/common/templates/post-build/setup-maestro-vars.yml +++ b/eng/common/templates/post-build/setup-maestro-vars.yml @@ -4,60 +4,5 @@ steps: # Specifies whether to use 1ES is1ESPipeline: false - - task: AzureCLI@2 - name: setReleaseVars - displayName: Set Release Configs Vars - inputs: - azureSubscription: "Darc: Maestro Production" - scriptType: pscore - scriptLocation: inlineScript - inlineScript: | - try { - if (!$Env:PromoteToMaestroChannels -or $Env:PromoteToMaestroChannels.Trim() -eq '') { - $Content = Get-Content $(Build.StagingDirectory)/ReleaseConfigs/ReleaseConfigs.txt - - $BarId = $Content | Select -Index 0 - $Channels = $Content | Select -Index 1 - $IsStableBuild = $Content | Select -Index 2 - - $AzureDevOpsProject = $Env:System_TeamProject - $AzureDevOpsBuildDefinitionId = $Env:System_DefinitionId - $AzureDevOpsBuildId = $Env:Build_BuildId - } - else { - . $(Build.SourcesDirectory)\eng\common\tools.ps1 - $darc = Get-Darc - $buildInfo = & $darc get-build ` - --id ${{ parameters.BARBuildId }} ` - --extended ` - --output-format json ` - --ci ` - | convertFrom-Json - - $BarId = ${{ parameters.BARBuildId }} - $Channels = $Env:PromoteToMaestroChannels -split "," - $Channels = $Channels -join "][" - $Channels = "[$Channels]" - - $IsStableBuild = $buildInfo.stable - $AzureDevOpsProject = $buildInfo.azureDevOpsProject - $AzureDevOpsBuildDefinitionId = $buildInfo.azureDevOpsBuildDefinitionId - $AzureDevOpsBuildId = $buildInfo.azureDevOpsBuildId - } - - Write-Host "##vso[task.setvariable variable=BARBuildId]$BarId" - Write-Host "##vso[task.setvariable variable=TargetChannels]$Channels" - Write-Host "##vso[task.setvariable variable=IsStableBuild]$IsStableBuild" - - Write-Host "##vso[task.setvariable variable=AzDOProjectName]$AzureDevOpsProject" - Write-Host "##vso[task.setvariable variable=AzDOPipelineId]$AzureDevOpsBuildDefinitionId" - Write-Host "##vso[task.setvariable variable=AzDOBuildId]$AzureDevOpsBuildId" - } - catch { - Write-Host $_ - Write-Host $_.Exception - Write-Host $_.ScriptStackTrace - exit 1 - } - env: - PromoteToMaestroChannels: ${{ parameters.PromoteToChannelIds }} + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} \ No newline at end of file From ff9176f66432d4328524c10800c281e06ef826b8 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 1 Jul 2024 09:57:18 -0700 Subject: [PATCH 282/568] update release information (#6926) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index ba5edd9fc56..fcc601dc952 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -5,7 +5,7 @@ https://github.com/dotnet/dotnet-monitor 9.0.0 preview - 6 + 7 true 2.0.0-beta4.24324.3 - 8.0.0-preview.24328.1 - 8.0.0-preview.24328.1 + 8.0.0-preview.24351.1 + 8.0.0-preview.24351.1 9.0.0-preview.24324.1 @@ -67,7 +67,7 @@ 9.0.100-preview.7.24329.1 - 1.0.532801 + 1.0.535101 $(MicrosoftNETCoreApp31Version) From d5b8df4166a011edcbba85923ca95162b374827e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 2 Jul 2024 14:29:39 +0000 Subject: [PATCH 284/568] Update dependencies from https://github.com/dotnet/arcade build 20240701.5 (#6936) [feature/9.x] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 +++++++------- eng/Versions.props | 6 ++--- eng/common/core-templates/job/job.yml | 24 +++-------------- .../job/source-index-stage1.yml | 16 ++---------- .../steps/component-governance.yml | 2 +- eng/common/templates/job/job.yml | 26 +++++++++++++++++++ global.json | 4 +-- 7 files changed, 47 insertions(+), 51 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2f1cc57da2e..6945ab2c1cb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,25 +22,25 @@ https://github.com/dotnet/roslyn-analyzers 43709af7570da7140fb3e9a5237f55ffb24677e7 - + https://github.com/dotnet/arcade - ede13bd35571c0c8b0c01edcb057031904c5c955 + 48f3eafb2fa9dddb1ca655b9ea96ebf4b5a2ba0a - + https://github.com/dotnet/arcade - ede13bd35571c0c8b0c01edcb057031904c5c955 + 48f3eafb2fa9dddb1ca655b9ea96ebf4b5a2ba0a - + https://github.com/dotnet/arcade - ede13bd35571c0c8b0c01edcb057031904c5c955 + 48f3eafb2fa9dddb1ca655b9ea96ebf4b5a2ba0a - + https://github.com/dotnet/arcade - ede13bd35571c0c8b0c01edcb057031904c5c955 + 48f3eafb2fa9dddb1ca655b9ea96ebf4b5a2ba0a - + https://github.com/dotnet/arcade - ede13bd35571c0c8b0c01edcb057031904c5c955 + 48f3eafb2fa9dddb1ca655b9ea96ebf4b5a2ba0a https://github.com/dotnet/diagnostics diff --git a/eng/Versions.props b/eng/Versions.props index b3f8b6eeebc..23b4cc7fdd0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,9 +48,9 @@ --> - 9.0.0-beta.24327.1 - 9.0.0-beta.24327.1 - 9.0.0-beta.24327.1 + 9.0.0-beta.24351.5 + 9.0.0-beta.24351.5 + 9.0.0-beta.24351.5 9.0.0-preview.7.24328.7 9.0.0-preview.7.24328.7 diff --git a/eng/common/core-templates/job/job.yml b/eng/common/core-templates/job/job.yml index 7df58527978..c732bee9f4a 100644 --- a/eng/common/core-templates/job/job.yml +++ b/eng/common/core-templates/job/job.yml @@ -24,12 +24,11 @@ parameters: enablePublishTestResults: false enablePublishUsingPipelines: false enableBuildRetry: false - disableComponentGovernance: '' - componentGovernanceIgnoreDirectories: '' mergeTestResults: false testRunTitle: '' testResultsFormat: '' name: '' + componentGovernanceSteps: [] preSteps: [] artifactPublishSteps: [] runAsPublic: false @@ -170,17 +169,8 @@ jobs: uploadRichNavArtifacts: ${{ coalesce(parameters.richCodeNavigationUploadArtifacts, false) }} continueOnError: true - - template: /eng/common/core-templates/steps/component-governance.yml - parameters: - is1ESPipeline: ${{ parameters.is1ESPipeline }} - ${{ if eq(parameters.disableComponentGovernance, '') }}: - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.runAsPublic, 'false'), or(startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/dotnet/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/microsoft/'), eq(variables['Build.SourceBranch'], 'refs/heads/main'))) }}: - disableComponentGovernance: false - ${{ else }}: - disableComponentGovernance: true - ${{ else }}: - disableComponentGovernance: ${{ parameters.disableComponentGovernance }} - componentGovernanceIgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }} + - ${{ each step in parameters.componentGovernanceSteps }}: + - ${{ step }} - ${{ if eq(parameters.enableMicrobuild, 'true') }}: - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: @@ -190,14 +180,6 @@ jobs: continueOnError: ${{ parameters.continueOnError }} env: TeamName: $(_TeamName) - - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.enableSbom, 'true')) }}: - - template: /eng/common/core-templates/steps/generate-sbom.yml - parameters: - is1ESPipeline: ${{ parameters.is1ESPipeline }} - PackageVersion: ${{ parameters.packageVersion}} - BuildDropPath: ${{ parameters.buildDropPath }} - IgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }} - publishArtifacts: false # Publish test results - ${{ if or(and(eq(parameters.enablePublishTestResults, 'true'), eq(parameters.testResultsFormat, '')), eq(parameters.testResultsFormat, 'xunit')) }}: diff --git a/eng/common/core-templates/job/source-index-stage1.yml b/eng/common/core-templates/job/source-index-stage1.yml index 8328e52ab10..945c1c19e82 100644 --- a/eng/common/core-templates/job/source-index-stage1.yml +++ b/eng/common/core-templates/job/source-index-stage1.yml @@ -69,23 +69,11 @@ jobs: - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - task: AzureCLI@2 - displayName: Get stage 1 auth token + displayName: Log in to Azure and upload stage1 artifacts to source index inputs: azureSubscription: 'SourceDotNet Stage1 Publish' addSpnToEnvironment: true scriptType: 'ps' scriptLocation: 'inlineScript' inlineScript: | - echo "##vso[task.setvariable variable=ARM_CLIENT_ID]$env:servicePrincipalId" - echo "##vso[task.setvariable variable=ARM_ID_TOKEN]$env:idToken" - echo "##vso[task.setvariable variable=ARM_TENANT_ID]$env:tenantId" - - - script: | - echo "Client ID: $(ARM_CLIENT_ID)" - echo "ID Token: $(ARM_ID_TOKEN)" - echo "Tenant ID: $(ARM_TENANT_ID)" - az login --service-principal -u $(ARM_CLIENT_ID) --tenant $(ARM_TENANT_ID) --allow-no-subscriptions --federated-token $(ARM_ID_TOKEN) - displayName: "Login to Azure" - - - script: $(Agent.TempDirectory)/.source-index/tools/UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name) -s netsourceindexstage1 -b stage1 - displayName: Upload stage1 artifacts to source index + $(Agent.TempDirectory)/.source-index/tools/UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name) -s netsourceindexstage1 -b stage1 diff --git a/eng/common/core-templates/steps/component-governance.yml b/eng/common/core-templates/steps/component-governance.yml index b8815892a5e..cf0649aa956 100644 --- a/eng/common/core-templates/steps/component-governance.yml +++ b/eng/common/core-templates/steps/component-governance.yml @@ -13,4 +13,4 @@ steps: continueOnError: true displayName: ${{ parameters.displayName }} inputs: - ignoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }} \ No newline at end of file + ignoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }} diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index 5920952c5ba..8da477dd69f 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -1,5 +1,11 @@ parameters: enablePublishBuildArtifacts: false + disableComponentGovernance: '' + componentGovernanceIgnoreDirectories: '' +# Sbom related params + enableSbom: true + PackageVersion: 9.0.0 + BuildDropPath: '$(Build.SourcesDirectory)/artifacts' jobs: - template: /eng/common/core-templates/job/job.yml @@ -13,6 +19,26 @@ jobs: steps: - ${{ each step in parameters.steps }}: - ${{ step }} + + componentGovernanceSteps: + - template: /eng/common/templates/steps/component-governance.yml + parameters: + ${{ if eq(parameters.disableComponentGovernance, '') }}: + ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.runAsPublic, 'false'), or(startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/dotnet/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/microsoft/'), eq(variables['Build.SourceBranch'], 'refs/heads/main'))) }}: + disableComponentGovernance: false + ${{ else }}: + disableComponentGovernance: true + ${{ else }}: + disableComponentGovernance: ${{ parameters.disableComponentGovernance }} + componentGovernanceIgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }} + + - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.enableSbom, 'true')) }}: + - template: /eng/common/templates/steps/generate-sbom.yml + parameters: + PackageVersion: ${{ parameters.packageVersion }} + BuildDropPath: ${{ parameters.buildDropPath }} + publishArtifacts: false + artifactPublishSteps: - ${{ if ne(parameters.artifacts.publish, '') }}: diff --git a/global.json b/global.json index 5f91d176963..9b803e0f08d 100644 --- a/global.json +++ b/global.json @@ -31,7 +31,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24327.1", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24327.1" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24351.5", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24351.5" } } From bbcb3fdaf2e4e8d05daf685047843e1a5ad8d065 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 2 Jul 2024 19:07:28 +0000 Subject: [PATCH 285/568] [feature/9.x] Update dependencies from dotnet/sdk (#6920) [feature/9.x] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Runtime.win-x64: from 9.0.0-preview.7.24328.7 to 9.0.0-preview.7.24329.2 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) - Microsoft.NETCore.App.Runtime.win-x64: from 9.0.0-preview.7.24327.11 to 9.0.0-preview.7.24351.4 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) - VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0: from 9.0.0-preview.7.24328.7 to 9.0.0-preview.7.24329.2 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) - VS.Redist.Common.NetCore.SharedFramework.x64.9.0: from 9.0.0-preview.7.24327.11 to 9.0.0-preview.7.24351.4 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6945ab2c1cb..d62eea74200 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/aspnetcore - 77994c64cee73e0093fe25cd434bee8bd2580b4e + d301328737c4912b95f236c4b349cf46ef7a473a https://github.com/dotnet/diagnostics @@ -46,21 +46,21 @@ https://github.com/dotnet/diagnostics 35a81a57c2624f570db3db448dbea40bb680b7eb - + https://github.com/dotnet/runtime - d88e6680e1f9e2cb4f5ee428aa169ab715158eab + 5044e936ce154fcf3223cbe6f5e2ad66605cea9f - + https://github.com/dotnet/aspnetcore - 77994c64cee73e0093fe25cd434bee8bd2580b4e + d301328737c4912b95f236c4b349cf46ef7a473a - + https://github.com/dotnet/sdk - a081e8d8cdcce5cb0b0329cf68cf190060e870a6 + 110670f4d3cea63521f9460a42db1123810b51f5 - + https://github.com/dotnet/runtime - d88e6680e1f9e2cb4f5ee428aa169ab715158eab + 5044e936ce154fcf3223cbe6f5e2ad66605cea9f diff --git a/eng/Versions.props b/eng/Versions.props index 23b4cc7fdd0..efc9686f85b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,8 +52,8 @@ 9.0.0-beta.24351.5 9.0.0-beta.24351.5 - 9.0.0-preview.7.24328.7 - 9.0.0-preview.7.24328.7 + 9.0.0-preview.7.24329.2 + 9.0.0-preview.7.24329.2 2.0.0-beta4.24324.3 @@ -62,10 +62,10 @@ 9.0.0-preview.24324.1 - 9.0.0-preview.7.24327.11 - 9.0.0-preview.7.24327.11 + 9.0.0-preview.7.24351.4 + 9.0.0-preview.7.24351.4 - 9.0.100-preview.7.24329.1 + 9.0.100-preview.7.24352.3 1.0.535101 From 11c166e36654efb02da5959bb7fe05b6069273b9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 3 Jul 2024 14:17:57 +0000 Subject: [PATCH 286/568] Update dependencies from https://github.com/dotnet/arcade build 20240702.2 (#6945) [feature/9.x] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- global.json | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d62eea74200..c299970f7bf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,25 +22,25 @@ https://github.com/dotnet/roslyn-analyzers 43709af7570da7140fb3e9a5237f55ffb24677e7 - + https://github.com/dotnet/arcade - 48f3eafb2fa9dddb1ca655b9ea96ebf4b5a2ba0a + 4a7d983f833d6b86365ea1b2b4d6ee72fbdbf944 - + https://github.com/dotnet/arcade - 48f3eafb2fa9dddb1ca655b9ea96ebf4b5a2ba0a + 4a7d983f833d6b86365ea1b2b4d6ee72fbdbf944 - + https://github.com/dotnet/arcade - 48f3eafb2fa9dddb1ca655b9ea96ebf4b5a2ba0a + 4a7d983f833d6b86365ea1b2b4d6ee72fbdbf944 - + https://github.com/dotnet/arcade - 48f3eafb2fa9dddb1ca655b9ea96ebf4b5a2ba0a + 4a7d983f833d6b86365ea1b2b4d6ee72fbdbf944 - + https://github.com/dotnet/arcade - 48f3eafb2fa9dddb1ca655b9ea96ebf4b5a2ba0a + 4a7d983f833d6b86365ea1b2b4d6ee72fbdbf944 https://github.com/dotnet/diagnostics diff --git a/eng/Versions.props b/eng/Versions.props index efc9686f85b..aec492ed7e3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,9 +48,9 @@ --> - 9.0.0-beta.24351.5 - 9.0.0-beta.24351.5 - 9.0.0-beta.24351.5 + 9.0.0-beta.24352.2 + 9.0.0-beta.24352.2 + 9.0.0-beta.24352.2 9.0.0-preview.7.24329.2 9.0.0-preview.7.24329.2 diff --git a/global.json b/global.json index 9b803e0f08d..c041b7fc9af 100644 --- a/global.json +++ b/global.json @@ -31,7 +31,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24351.5", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24351.5" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24352.2", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24352.2" } } From 46e81fd35b962a6f44b34500990cb94937673991 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 3 Jul 2024 14:19:20 +0000 Subject: [PATCH 287/568] Update dependencies from https://github.com/dotnet/diagnostics build 20240702.1 (#6944) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c299970f7bf..f1bf2e36540 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore d301328737c4912b95f236c4b349cf46ef7a473a - + https://github.com/dotnet/diagnostics - 35a81a57c2624f570db3db448dbea40bb680b7eb + 1341d2c799a10f5cd1e748f90d59a63bb9e1b3f4 - + https://github.com/dotnet/diagnostics - 35a81a57c2624f570db3db448dbea40bb680b7eb + 1341d2c799a10f5cd1e748f90d59a63bb9e1b3f4 https://github.com/dotnet/command-line-api @@ -42,9 +42,9 @@ https://github.com/dotnet/arcade 4a7d983f833d6b86365ea1b2b4d6ee72fbdbf944 - + https://github.com/dotnet/diagnostics - 35a81a57c2624f570db3db448dbea40bb680b7eb + 1341d2c799a10f5cd1e748f90d59a63bb9e1b3f4 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index aec492ed7e3..1173f9ac58d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24324.3 - 8.0.0-preview.24351.1 - 8.0.0-preview.24351.1 + 8.0.0-preview.24352.1 + 8.0.0-preview.24352.1 9.0.0-preview.24324.1 @@ -67,7 +67,7 @@ 9.0.100-preview.7.24352.3 - 1.0.535101 + 1.0.535201 $(MicrosoftNETCoreApp31Version) From 61bc89f5ade625368782ffc52877aa6af2aa21f6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 3 Jul 2024 14:31:38 +0000 Subject: [PATCH 288/568] Update dependencies from https://github.com/dotnet/sdk build 20240703.5 (#6947) [feature/9.x] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NETCore.App.Runtime.win-x64: from 9.0.0-preview.7.24351.4 to 9.0.0-preview.7.24352.15 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) - VS.Redist.Common.NetCore.SharedFramework.x64.9.0: from 9.0.0-preview.7.24351.4 to 9.0.0-preview.7.24352.15 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f1bf2e36540..de1d83d7529 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -46,21 +46,21 @@ https://github.com/dotnet/diagnostics 1341d2c799a10f5cd1e748f90d59a63bb9e1b3f4 - + https://github.com/dotnet/runtime - 5044e936ce154fcf3223cbe6f5e2ad66605cea9f + 1d16fd14fa772621c7b09ebd00f83610207b1abf https://github.com/dotnet/aspnetcore d301328737c4912b95f236c4b349cf46ef7a473a - + https://github.com/dotnet/sdk - 110670f4d3cea63521f9460a42db1123810b51f5 + e09e3a57e51d5e24f7a1432b521932dce8058316 - + https://github.com/dotnet/runtime - 5044e936ce154fcf3223cbe6f5e2ad66605cea9f + 1d16fd14fa772621c7b09ebd00f83610207b1abf diff --git a/eng/Versions.props b/eng/Versions.props index 1173f9ac58d..c637a6f6ac3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -62,10 +62,10 @@ 9.0.0-preview.24324.1 - 9.0.0-preview.7.24351.4 - 9.0.0-preview.7.24351.4 + 9.0.0-preview.7.24352.15 + 9.0.0-preview.7.24352.15 - 9.0.100-preview.7.24352.3 + 9.0.100-preview.7.24353.5 1.0.535201 From 8d52d6be8977d2b1d41b27350f7810e628dde20f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 8 Jul 2024 15:40:58 -0700 Subject: [PATCH 289/568] [feature/9.x] Update dependencies from dotnet/diagnostics (#6953) * Update dependencies from https://github.com/dotnet/diagnostics build 20240703.1 Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe , Microsoft.FileFormats From Version 8.0.0-preview.24352.1 -> To Version 8.0.0-preview.24353.1 * Update dependencies from https://github.com/dotnet/diagnostics build 20240704.1 Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe , Microsoft.FileFormats From Version 8.0.0-preview.24352.1 -> To Version 8.0.0-preview.24354.1 * Update dependencies from https://github.com/dotnet/diagnostics build 20240704.1 Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe , Microsoft.FileFormats From Version 8.0.0-preview.24352.1 -> To Version 8.0.0-preview.24354.1 * Update dependencies from https://github.com/dotnet/diagnostics build 20240704.1 Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe , Microsoft.FileFormats From Version 8.0.0-preview.24352.1 -> To Version 8.0.0-preview.24354.1 * Update dependencies from https://github.com/dotnet/diagnostics build 20240705.1 Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe , Microsoft.FileFormats From Version 8.0.0-preview.24352.1 -> To Version 8.0.0-preview.24355.1 --------- Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index de1d83d7529..6879e6d9d78 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore d301328737c4912b95f236c4b349cf46ef7a473a - + https://github.com/dotnet/diagnostics - 1341d2c799a10f5cd1e748f90d59a63bb9e1b3f4 + bc0513ef320ee4e4d8c3981737975c18778c88bb - + https://github.com/dotnet/diagnostics - 1341d2c799a10f5cd1e748f90d59a63bb9e1b3f4 + bc0513ef320ee4e4d8c3981737975c18778c88bb https://github.com/dotnet/command-line-api @@ -42,9 +42,9 @@ https://github.com/dotnet/arcade 4a7d983f833d6b86365ea1b2b4d6ee72fbdbf944 - + https://github.com/dotnet/diagnostics - 1341d2c799a10f5cd1e748f90d59a63bb9e1b3f4 + bc0513ef320ee4e4d8c3981737975c18778c88bb https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index c637a6f6ac3..bd7d25c154c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24324.3 - 8.0.0-preview.24352.1 - 8.0.0-preview.24352.1 + 8.0.0-preview.24355.1 + 8.0.0-preview.24355.1 9.0.0-preview.24324.1 @@ -67,7 +67,7 @@ 9.0.100-preview.7.24353.5 - 1.0.535201 + 1.0.535501 $(MicrosoftNETCoreApp31Version) From f461e4344a7b4362a36a017616148dd7f24bfc02 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 8 Jul 2024 15:41:12 -0700 Subject: [PATCH 290/568] [feature/9.x] Update dependencies from dotnet/sdk (#6954) * Update dependencies from https://github.com/dotnet/sdk build 20240704.5 VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0 From Version 9.0.100-preview.7.24353.5 -> To Version 9.0.100-preview.7.24354.5 Dependency coherency updates Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0 From Version 9.0.0-preview.7.24329.2 -> To Version 9.0.0-preview.7.24353.8 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0 * Update dependencies from https://github.com/dotnet/sdk build 20240705.2 VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0 From Version 9.0.100-preview.7.24353.5 -> To Version 9.0.100-preview.7.24355.2 Dependency coherency updates Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0 From Version 9.0.0-preview.7.24329.2 -> To Version 9.0.0-preview.7.24354.8 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0 * Update dependencies from https://github.com/dotnet/sdk build 20240705.6 VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0 From Version 9.0.100-preview.7.24353.5 -> To Version 9.0.100-preview.7.24355.6 Dependency coherency updates Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0 From Version 9.0.0-preview.7.24329.2 -> To Version 9.0.0-preview.7.24355.2 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0 * Update dependencies from https://github.com/dotnet/sdk build 20240707.2 VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0 From Version 9.0.100-preview.7.24353.5 -> To Version 9.0.100-preview.7.24357.2 Dependency coherency updates Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0 From Version 9.0.0-preview.7.24329.2 -> To Version 9.0.0-preview.7.24355.2 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0 * Update dependencies from https://github.com/dotnet/sdk build 20240708.2 VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0 From Version 9.0.100-preview.7.24353.5 -> To Version 9.0.100-preview.7.24358.2 Dependency coherency updates Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0 From Version 9.0.0-preview.7.24329.2 -> To Version 9.0.0-preview.7.24355.2 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0 --------- Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6879e6d9d78..0f1186c80aa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/aspnetcore - d301328737c4912b95f236c4b349cf46ef7a473a + 06533a6b6d2142fd083279e6e4c74d811a467476 https://github.com/dotnet/diagnostics @@ -50,13 +50,13 @@ https://github.com/dotnet/runtime 1d16fd14fa772621c7b09ebd00f83610207b1abf - + https://github.com/dotnet/aspnetcore - d301328737c4912b95f236c4b349cf46ef7a473a + 06533a6b6d2142fd083279e6e4c74d811a467476 - + https://github.com/dotnet/sdk - e09e3a57e51d5e24f7a1432b521932dce8058316 + ab2b233274d4e6738600cb9722a252611025cd7f https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index bd7d25c154c..c27233f6b0c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,8 +52,8 @@ 9.0.0-beta.24352.2 9.0.0-beta.24352.2 - 9.0.0-preview.7.24329.2 - 9.0.0-preview.7.24329.2 + 9.0.0-preview.7.24355.2 + 9.0.0-preview.7.24355.2 2.0.0-beta4.24324.3 @@ -65,7 +65,7 @@ 9.0.0-preview.7.24352.15 9.0.0-preview.7.24352.15 - 9.0.100-preview.7.24353.5 + 9.0.100-preview.7.24358.2 1.0.535501 From d2cbe9222c34b7ec414f9f169e309a20e6db632c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 9 Jul 2024 17:22:09 +0000 Subject: [PATCH 291/568] Update dependencies from https://github.com/dotnet/diagnostics build 20240708.1 (#6966) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0f1186c80aa..8e1c793afa3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore 06533a6b6d2142fd083279e6e4c74d811a467476 - + https://github.com/dotnet/diagnostics - bc0513ef320ee4e4d8c3981737975c18778c88bb + d79052da3d2babc9323abb84959c93c2f94701e7 - + https://github.com/dotnet/diagnostics - bc0513ef320ee4e4d8c3981737975c18778c88bb + d79052da3d2babc9323abb84959c93c2f94701e7 https://github.com/dotnet/command-line-api @@ -42,9 +42,9 @@ https://github.com/dotnet/arcade 4a7d983f833d6b86365ea1b2b4d6ee72fbdbf944 - + https://github.com/dotnet/diagnostics - bc0513ef320ee4e4d8c3981737975c18778c88bb + d79052da3d2babc9323abb84959c93c2f94701e7 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index c27233f6b0c..53a7d3b7808 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24324.3 - 8.0.0-preview.24355.1 - 8.0.0-preview.24355.1 + 8.0.0-preview.24358.1 + 8.0.0-preview.24358.1 9.0.0-preview.24324.1 @@ -67,7 +67,7 @@ 9.0.100-preview.7.24358.2 - 1.0.535501 + 1.0.535801 $(MicrosoftNETCoreApp31Version) From 64d3cd7bbb1a5f12dd32d6c2f4f8d75b9290a837 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 10 Jul 2024 13:53:29 +0000 Subject: [PATCH 292/568] Update dependencies from https://github.com/dotnet/diagnostics build 20240709.1 (#6976) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8e1c793afa3..409174bd865 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore 06533a6b6d2142fd083279e6e4c74d811a467476 - + https://github.com/dotnet/diagnostics - d79052da3d2babc9323abb84959c93c2f94701e7 + 616d3af6932d67542a35311b334b41e152161649 - + https://github.com/dotnet/diagnostics - d79052da3d2babc9323abb84959c93c2f94701e7 + 616d3af6932d67542a35311b334b41e152161649 https://github.com/dotnet/command-line-api @@ -42,9 +42,9 @@ https://github.com/dotnet/arcade 4a7d983f833d6b86365ea1b2b4d6ee72fbdbf944 - + https://github.com/dotnet/diagnostics - d79052da3d2babc9323abb84959c93c2f94701e7 + 616d3af6932d67542a35311b334b41e152161649 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 53a7d3b7808..76886c582ae 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24324.3 - 8.0.0-preview.24358.1 - 8.0.0-preview.24358.1 + 8.0.0-preview.24359.1 + 8.0.0-preview.24359.1 9.0.0-preview.24324.1 @@ -67,7 +67,7 @@ 9.0.100-preview.7.24358.2 - 1.0.535801 + 1.0.535901 $(MicrosoftNETCoreApp31Version) From 996917fac91ae5b6c9163ed6bc3bcd8bb4df3bfd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 10 Jul 2024 14:01:10 +0000 Subject: [PATCH 293/568] Update dependencies from https://github.com/dotnet/arcade build 20240710.1 (#6977) [feature/9.x] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 +++++++------- eng/Versions.props | 6 ++--- .../job/publish-build-assets.yml | 27 +++---------------- global.json | 4 +-- 4 files changed, 19 insertions(+), 38 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 409174bd865..21c77981a1d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,25 +22,25 @@ https://github.com/dotnet/roslyn-analyzers 43709af7570da7140fb3e9a5237f55ffb24677e7 - + https://github.com/dotnet/arcade - 4a7d983f833d6b86365ea1b2b4d6ee72fbdbf944 + f20056daa31b4a08f2ce379cfe4610042c3bc26c - + https://github.com/dotnet/arcade - 4a7d983f833d6b86365ea1b2b4d6ee72fbdbf944 + f20056daa31b4a08f2ce379cfe4610042c3bc26c - + https://github.com/dotnet/arcade - 4a7d983f833d6b86365ea1b2b4d6ee72fbdbf944 + f20056daa31b4a08f2ce379cfe4610042c3bc26c - + https://github.com/dotnet/arcade - 4a7d983f833d6b86365ea1b2b4d6ee72fbdbf944 + f20056daa31b4a08f2ce379cfe4610042c3bc26c - + https://github.com/dotnet/arcade - 4a7d983f833d6b86365ea1b2b4d6ee72fbdbf944 + f20056daa31b4a08f2ce379cfe4610042c3bc26c https://github.com/dotnet/diagnostics diff --git a/eng/Versions.props b/eng/Versions.props index 76886c582ae..48a4dd6cf72 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,9 +48,9 @@ --> - 9.0.0-beta.24352.2 - 9.0.0-beta.24352.2 - 9.0.0-beta.24352.2 + 9.0.0-beta.24360.1 + 9.0.0-beta.24360.1 + 9.0.0-beta.24360.1 9.0.0-preview.7.24355.2 9.0.0-preview.7.24355.2 diff --git a/eng/common/core-templates/job/publish-build-assets.yml b/eng/common/core-templates/job/publish-build-assets.yml index d99a1a3b284..ec3cd14191a 100644 --- a/eng/common/core-templates/job/publish-build-assets.yml +++ b/eng/common/core-templates/job/publish-build-assets.yml @@ -113,38 +113,19 @@ jobs: Add-Content -Path $filePath -Value "$(DefaultChannels)" Add-Content -Path $filePath -Value $(IsStableBuild) - - template: /eng/common/core-templates/steps/publish-build-artifacts.yml - parameters: - is1ESPipeline: ${{ parameters.is1ESPipeline }} - args: - displayName: Publish ReleaseConfigs Artifact - pathToPublish: '$(Build.StagingDirectory)/ReleaseConfigs' - publishLocation: Container - artifactName: ReleaseConfigs - - - task: powershell@2 - displayName: Check if SymbolPublishingExclusionsFile.txt exists - inputs: - targetType: inline - script: | $symbolExclusionfile = "$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt" - if(Test-Path -Path $symbolExclusionfile) + if (Test-Path -Path $symbolExclusionfile) { Write-Host "SymbolExclusionFile exists" - Write-Host "##vso[task.setvariable variable=SymbolExclusionFile]true" - } - else{ - Write-Host "Symbols Exclusion file does not exist" - Write-Host "##vso[task.setvariable variable=SymbolExclusionFile]false" + Copy-Item -Path $symbolExclusionfile -Destination "$(Build.StagingDirectory)/ReleaseConfigs" } - template: /eng/common/core-templates/steps/publish-build-artifacts.yml parameters: is1ESPipeline: ${{ parameters.is1ESPipeline }} args: - displayName: Publish SymbolPublishingExclusionsFile Artifact - condition: eq(variables['SymbolExclusionFile'], 'true') - pathToPublish: '$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' + displayName: Publish ReleaseConfigs Artifact + pathToPublish: '$(Build.StagingDirectory)/ReleaseConfigs' publishLocation: Container artifactName: ReleaseConfigs diff --git a/global.json b/global.json index c041b7fc9af..bdade0275d6 100644 --- a/global.json +++ b/global.json @@ -31,7 +31,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24352.2", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24352.2" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24360.1", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24360.1" } } From 9d9e34c51e84b48b1c9534c930146485477f2fc6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 11 Jul 2024 14:26:33 +0000 Subject: [PATCH 294/568] Update dependencies from https://github.com/dotnet/arcade build 20240710.4 (#6983) [feature/9.x] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- eng/common/cross/build-rootfs.sh | 2 +- global.json | 4 ++-- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 21c77981a1d..19aa6fa8089 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,25 +22,25 @@ https://github.com/dotnet/roslyn-analyzers 43709af7570da7140fb3e9a5237f55ffb24677e7 - + https://github.com/dotnet/arcade - f20056daa31b4a08f2ce379cfe4610042c3bc26c + 731d793be2d0a66bafc96b1a79dc96b4d1f0301b - + https://github.com/dotnet/arcade - f20056daa31b4a08f2ce379cfe4610042c3bc26c + 731d793be2d0a66bafc96b1a79dc96b4d1f0301b - + https://github.com/dotnet/arcade - f20056daa31b4a08f2ce379cfe4610042c3bc26c + 731d793be2d0a66bafc96b1a79dc96b4d1f0301b - + https://github.com/dotnet/arcade - f20056daa31b4a08f2ce379cfe4610042c3bc26c + 731d793be2d0a66bafc96b1a79dc96b4d1f0301b - + https://github.com/dotnet/arcade - f20056daa31b4a08f2ce379cfe4610042c3bc26c + 731d793be2d0a66bafc96b1a79dc96b4d1f0301b https://github.com/dotnet/diagnostics diff --git a/eng/Versions.props b/eng/Versions.props index 48a4dd6cf72..cc6bee4d22d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,9 +48,9 @@ --> - 9.0.0-beta.24360.1 - 9.0.0-beta.24360.1 - 9.0.0-beta.24360.1 + 9.0.0-beta.24360.4 + 9.0.0-beta.24360.4 + 9.0.0-beta.24360.4 9.0.0-preview.7.24355.2 9.0.0-preview.7.24355.2 diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index eb1a9080464..6d99d1263c0 100644 --- a/eng/common/cross/build-rootfs.sh +++ b/eng/common/cross/build-rootfs.sh @@ -72,7 +72,7 @@ __AlpinePackages+=" krb5-dev" __AlpinePackages+=" openssl-dev" __AlpinePackages+=" zlib-dev" -__FreeBSDBase="13.2-RELEASE" +__FreeBSDBase="13.3-RELEASE" __FreeBSDPkg="1.17.0" __FreeBSDABI="13" __FreeBSDPackages="libunwind" diff --git a/global.json b/global.json index bdade0275d6..be52ae7d038 100644 --- a/global.json +++ b/global.json @@ -31,7 +31,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24360.1", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24360.1" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24360.4", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24360.4" } } From 398dfe30abd0322cf7a7a841983a2699d712b016 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 12 Jul 2024 14:46:23 +0000 Subject: [PATCH 295/568] [feature/9.x] Update dependencies from dotnet/diagnostics (#6982) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 19aa6fa8089..da4873ffd39 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore 06533a6b6d2142fd083279e6e4c74d811a467476 - + https://github.com/dotnet/diagnostics - 616d3af6932d67542a35311b334b41e152161649 + 36f19c4904821895ca4d08969adb65b46964b3ce - + https://github.com/dotnet/diagnostics - 616d3af6932d67542a35311b334b41e152161649 + 36f19c4904821895ca4d08969adb65b46964b3ce https://github.com/dotnet/command-line-api @@ -42,9 +42,9 @@ https://github.com/dotnet/arcade 731d793be2d0a66bafc96b1a79dc96b4d1f0301b - + https://github.com/dotnet/diagnostics - 616d3af6932d67542a35311b334b41e152161649 + 36f19c4904821895ca4d08969adb65b46964b3ce https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index cc6bee4d22d..0884d53b55b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24324.3 - 8.0.0-preview.24359.1 - 8.0.0-preview.24359.1 + 8.0.0-preview.24360.1 + 8.0.0-preview.24360.1 9.0.0-preview.24324.1 @@ -67,7 +67,7 @@ 9.0.100-preview.7.24358.2 - 1.0.535901 + 1.0.536001 $(MicrosoftNETCoreApp31Version) From ea5b79cb48758c118dd691ed0ddb947275a13ced Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 12 Jul 2024 18:08:47 +0000 Subject: [PATCH 296/568] Update dependencies from https://github.com/dotnet/sdk build 20240709.2 (#6967) [feature/9.x] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Runtime.win-x64: from 9.0.0-preview.7.24355.2 to 9.0.0-preview.7.24358.3 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) - Microsoft.NETCore.App.Runtime.win-x64: from 9.0.0-preview.7.24352.15 to 9.0.0-preview.7.24357.2 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) - VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0: from 9.0.0-preview.7.24355.2 to 9.0.0-preview.7.24358.3 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) - VS.Redist.Common.NetCore.SharedFramework.x64.9.0: from 9.0.0-preview.7.24352.15 to 9.0.0-preview.7.24357.2 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) - Merge branch 'feature/9.x' into darc-feature/9.x-9fafac71-e757-4f17-9c22-7456c178be52 --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index da4873ffd39..fb5d524d38f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/aspnetcore - 06533a6b6d2142fd083279e6e4c74d811a467476 + fed7b428b2c34cc1850557111f945e4cbe5d1268 https://github.com/dotnet/diagnostics @@ -46,21 +46,21 @@ https://github.com/dotnet/diagnostics 36f19c4904821895ca4d08969adb65b46964b3ce - + https://github.com/dotnet/runtime - 1d16fd14fa772621c7b09ebd00f83610207b1abf + 4e278fe17f69ea31fbdcbab74ac47ec6fa84914b - + https://github.com/dotnet/aspnetcore - 06533a6b6d2142fd083279e6e4c74d811a467476 + fed7b428b2c34cc1850557111f945e4cbe5d1268 - + https://github.com/dotnet/sdk - ab2b233274d4e6738600cb9722a252611025cd7f + 8ca5983e4462a95821a5f226b6f89a398112d2bb - + https://github.com/dotnet/runtime - 1d16fd14fa772621c7b09ebd00f83610207b1abf + 4e278fe17f69ea31fbdcbab74ac47ec6fa84914b diff --git a/eng/Versions.props b/eng/Versions.props index 0884d53b55b..a3516150e08 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,8 +52,8 @@ 9.0.0-beta.24360.4 9.0.0-beta.24360.4 - 9.0.0-preview.7.24355.2 - 9.0.0-preview.7.24355.2 + 9.0.0-preview.7.24358.3 + 9.0.0-preview.7.24358.3 2.0.0-beta4.24324.3 @@ -62,10 +62,10 @@ 9.0.0-preview.24324.1 - 9.0.0-preview.7.24352.15 - 9.0.0-preview.7.24352.15 + 9.0.0-preview.7.24357.2 + 9.0.0-preview.7.24357.2 - 9.0.100-preview.7.24358.2 + 9.0.100-preview.7.24359.2 1.0.536001 From f150d97301a3142d09e259a20e28314b91130bbb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 12 Jul 2024 20:15:57 +0000 Subject: [PATCH 297/568] [feature/9.x] Update dependencies from dotnet/sdk (#6985) [feature/9.x] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Runtime.win-x64: from 9.0.0-preview.7.24358.3 to 9.0.0-preview.7.24360.7 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) - VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0: from 9.0.0-preview.7.24358.3 to 9.0.0-preview.7.24360.7 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fb5d524d38f..90f9c7286df 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/aspnetcore - fed7b428b2c34cc1850557111f945e4cbe5d1268 + 71b5ef3f5c997fbbb9ff3dc1a16d58e8ccdeed52 https://github.com/dotnet/diagnostics @@ -50,13 +50,13 @@ https://github.com/dotnet/runtime 4e278fe17f69ea31fbdcbab74ac47ec6fa84914b - + https://github.com/dotnet/aspnetcore - fed7b428b2c34cc1850557111f945e4cbe5d1268 + 71b5ef3f5c997fbbb9ff3dc1a16d58e8ccdeed52 - + https://github.com/dotnet/sdk - 8ca5983e4462a95821a5f226b6f89a398112d2bb + 81ac886071828da7f14d0c26d731ac06abd0c7f6 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index a3516150e08..cc503891d33 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,8 +52,8 @@ 9.0.0-beta.24360.4 9.0.0-beta.24360.4 - 9.0.0-preview.7.24358.3 - 9.0.0-preview.7.24358.3 + 9.0.0-preview.7.24360.7 + 9.0.0-preview.7.24360.7 2.0.0-beta4.24324.3 @@ -65,7 +65,7 @@ 9.0.0-preview.7.24357.2 9.0.0-preview.7.24357.2 - 9.0.100-preview.7.24359.2 + 9.0.100-preview.7.24361.1 1.0.536001 From b0f2f178f81f4098ed8c6d4b0f253648531052f1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 13 Jul 2024 14:54:43 +0000 Subject: [PATCH 298/568] Update dependencies from https://github.com/dotnet/sdk build 20240712.28 (#6986) [feature/9.x] Update dependencies from dotnet/sdk --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 90f9c7286df..852613f2a0b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,9 +54,9 @@ https://github.com/dotnet/aspnetcore 71b5ef3f5c997fbbb9ff3dc1a16d58e8ccdeed52 - + https://github.com/dotnet/sdk - 81ac886071828da7f14d0c26d731ac06abd0c7f6 + a2689ba4aacc5d91a0c5c801bb4a6ac5d55a771d https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index cc503891d33..e73cd34276f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,7 +65,7 @@ 9.0.0-preview.7.24357.2 9.0.0-preview.7.24357.2 - 9.0.100-preview.7.24361.1 + 9.0.100-preview.7.24362.28 1.0.536001 From 43d88d20f9f94b5e57d28f0eb3af131cd93629e4 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 15 Jul 2024 00:08:12 +0000 Subject: [PATCH 299/568] Restore branch-specific files --- .../job/publish-build-assets.yml | 127 +----------------- .../templates/job/publish-build-assets.yml | 123 +---------------- 2 files changed, 4 insertions(+), 246 deletions(-) diff --git a/eng/common/templates-official/job/publish-build-assets.yml b/eng/common/templates-official/job/publish-build-assets.yml index 19c969945df..d667a70e8de 100644 --- a/eng/common/templates-official/job/publish-build-assets.yml +++ b/eng/common/templates-official/job/publish-build-assets.yml @@ -3,128 +3,5 @@ jobs: parameters: is1ESPipeline: true - dependsOn: ${{ parameters.dependsOn }} - timeoutInMinutes: 150 - - ${{ if eq(parameters.publishAssetsImmediately, 'true') }}: - displayName: Publish Assets - ${{ else }}: - displayName: Publish to Build Asset Registry - - variables: - - template: /eng/common/templates-official/variables/pool-providers.yml - - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - group: Publish-Build-Assets - - group: AzureDevOps-Artifact-Feeds-Pats - - name: runCodesignValidationInjection - value: false - - ${{ if eq(parameters.publishAssetsImmediately, 'true') }}: - - template: /eng/common/templates-official/post-build/common-variables.yml - - pool: - # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) - ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: - name: AzurePipelines-EO - image: 1ESPT-Windows2022 - demands: Cmd - os: windows - # If it's not devdiv, it's dnceng - ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: - name: NetCore1ESPool-Publishing-Internal - image: windows.vs2019.amd64 - os: windows - steps: - - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - task: DownloadBuildArtifacts@0 - displayName: Download artifact - inputs: - artifactName: AssetManifests - downloadPath: '$(Build.StagingDirectory)/Download' - checkDownloadedFiles: true - condition: ${{ parameters.condition }} - continueOnError: ${{ parameters.continueOnError }} - - - task: NuGetAuthenticate@1 - - - task: AzureCLI@2 - displayName: Publish Build Assets - inputs: - azureSubscription: "Darc: Maestro Production" - scriptType: ps - scriptLocation: scriptPath - scriptPath: $(Build.SourcesDirectory)/eng/common/sdk-task.ps1 - arguments: > - -task PublishBuildAssets -restore -msbuildEngine dotnet - /p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests' - /p:MaestroApiEndpoint=https://maestro-prod.westus2.cloudapp.azure.com - /p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }} - /p:OfficialBuildId=$(Build.BuildNumber) - condition: ${{ parameters.condition }} - continueOnError: ${{ parameters.continueOnError }} - - - task: powershell@2 - displayName: Create ReleaseConfigs Artifact - inputs: - targetType: inline - script: | - New-Item -Path "$(Build.StagingDirectory)/ReleaseConfigs" -ItemType Directory -Force - $filePath = "$(Build.StagingDirectory)/ReleaseConfigs/ReleaseConfigs.txt" - Add-Content -Path $filePath -Value $(BARBuildId) - Add-Content -Path $filePath -Value "$(DefaultChannels)" - Add-Content -Path $filePath -Value $(IsStableBuild) - - - task: 1ES.PublishBuildArtifacts@1 - displayName: Publish ReleaseConfigs Artifact - inputs: - PathtoPublish: '$(Build.StagingDirectory)/ReleaseConfigs' - PublishLocation: Container - ArtifactName: ReleaseConfigs - - - task: powershell@2 - displayName: Check if SymbolPublishingExclusionsFile.txt exists - inputs: - targetType: inline - script: | - $symbolExclusionfile = "$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt" - if(Test-Path -Path $symbolExclusionfile) - { - Write-Host "SymbolExclusionFile exists" - Write-Host "##vso[task.setvariable variable=SymbolExclusionFile]true" - } - else{ - Write-Host "Symbols Exclusion file does not exists" - Write-Host "##vso[task.setvariable variable=SymbolExclusionFile]false" - } - - - task: 1ES.PublishBuildArtifacts@1 - displayName: Publish SymbolPublishingExclusionsFile Artifact - condition: eq(variables['SymbolExclusionFile'], 'true') - inputs: - PathtoPublish: '$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' - PublishLocation: Container - ArtifactName: ReleaseConfigs - - - ${{ if eq(parameters.publishAssetsImmediately, 'true') }}: - - template: /eng/common/templates-official/post-build/setup-maestro-vars.yml - parameters: - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - - - task: AzureCLI@2 - displayName: Publish Using Darc - inputs: - azureSubscription: "Darc: Maestro Production" - scriptType: ps - scriptLocation: scriptPath - scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 - arguments: -BuildId $(BARBuildId) - -PublishingInfraVersion 3 - -AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)' - -WaitPublishingFinish true - -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' - -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' - - - ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}: - - template: /eng/common/templates-official/steps/publish-logs.yml - parameters: - JobLabel: 'Publish_Artifacts_Logs' + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml index 0e3870f0cf8..ab2edec2adb 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -3,124 +3,5 @@ jobs: parameters: is1ESPipeline: false - dependsOn: ${{ parameters.dependsOn }} - timeoutInMinutes: 150 - - ${{ if eq(parameters.publishAssetsImmediately, 'true') }}: - displayName: Publish Assets - ${{ else }}: - displayName: Publish to Build Asset Registry - - variables: - - template: /eng/common/templates/variables/pool-providers.yml - - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - group: Publish-Build-Assets - - group: AzureDevOps-Artifact-Feeds-Pats - - name: runCodesignValidationInjection - value: false - - ${{ if eq(parameters.publishAssetsImmediately, 'true') }}: - - template: /eng/common/templates/post-build/common-variables.yml - - pool: - # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) - ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: - name: VSEngSS-MicroBuild2022-1ES - demands: Cmd - # If it's not devdiv, it's dnceng - ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: - name: NetCore1ESPool-Publishing-Internal - demands: ImageOverride -equals windows.vs2019.amd64 - - steps: - - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - task: DownloadBuildArtifacts@0 - displayName: Download artifact - inputs: - artifactName: AssetManifests - downloadPath: '$(Build.StagingDirectory)/Download' - checkDownloadedFiles: true - condition: ${{ parameters.condition }} - continueOnError: ${{ parameters.continueOnError }} - - - task: NuGetAuthenticate@1 - - - task: AzureCLI@2 - displayName: Publish Build Assets - inputs: - azureSubscription: "Darc: Maestro Production" - scriptType: ps - scriptLocation: scriptPath - scriptPath: $(Build.SourcesDirectory)/eng/common/sdk-task.ps1 - arguments: > - -task PublishBuildAssets -restore -msbuildEngine dotnet - /p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests' - /p:MaestroApiEndpoint=https://maestro.dot.net - /p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }} - /p:OfficialBuildId=$(Build.BuildNumber) - condition: ${{ parameters.condition }} - continueOnError: ${{ parameters.continueOnError }} - - - task: powershell@2 - displayName: Create ReleaseConfigs Artifact - inputs: - targetType: inline - script: | - Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value $(BARBuildId) - Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value "$(DefaultChannels)" - Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value $(IsStableBuild) - - - task: PublishBuildArtifacts@1 - displayName: Publish ReleaseConfigs Artifact - inputs: - PathtoPublish: '$(Build.StagingDirectory)/ReleaseConfigs.txt' - PublishLocation: Container - ArtifactName: ReleaseConfigs - - - task: powershell@2 - displayName: Check if SymbolPublishingExclusionsFile.txt exists - inputs: - targetType: inline - script: | - $symbolExclusionfile = "$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt" - if(Test-Path -Path $symbolExclusionfile) - { - Write-Host "SymbolExclusionFile exists" - Write-Host "##vso[task.setvariable variable=SymbolExclusionFile]true" - } - else{ - Write-Host "Symbols Exclusion file does not exists" - Write-Host "##vso[task.setvariable variable=SymbolExclusionFile]false" - } - - - task: PublishBuildArtifacts@1 - displayName: Publish SymbolPublishingExclusionsFile Artifact - condition: eq(variables['SymbolExclusionFile'], 'true') - inputs: - PathtoPublish: '$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' - PublishLocation: Container - ArtifactName: ReleaseConfigs - - - ${{ if eq(parameters.publishAssetsImmediately, 'true') }}: - - template: /eng/common/templates/post-build/setup-maestro-vars.yml - parameters: - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - - - task: AzureCLI@2 - displayName: Publish Using Darc - inputs: - azureSubscription: "Darc: Maestro Production" - scriptType: ps - scriptLocation: scriptPath - scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 - arguments: -BuildId $(BARBuildId) - -PublishingInfraVersion 3 - -AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)' - -WaitPublishingFinish true - -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' - -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' - - - ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}: - - template: /eng/common/templates/steps/publish-logs.yml - parameters: - JobLabel: 'Publish_Artifacts_Logs' + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} From eb56b5d6e534a3c33b02837eea3b4d910cd1a443 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 15 Jul 2024 10:57:28 -0700 Subject: [PATCH 300/568] Update dependencies from https://github.com/dotnet/sdk build 20240715.8 (#6990) VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0 From Version 9.0.100-preview.7.24362.28 -> To Version 9.0.100-preview.7.24365.8 Dependency coherency updates Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.NetCore.SharedFramework.x64.9.0 From Version 9.0.0-preview.7.24357.2 -> To Version 9.0.0-preview.7.24363.5 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 852613f2a0b..109a7536d0f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -46,21 +46,21 @@ https://github.com/dotnet/diagnostics 36f19c4904821895ca4d08969adb65b46964b3ce - + https://github.com/dotnet/runtime - 4e278fe17f69ea31fbdcbab74ac47ec6fa84914b + 5ab200cd23f23baefc2d7189bf721075400fb7f2 https://github.com/dotnet/aspnetcore 71b5ef3f5c997fbbb9ff3dc1a16d58e8ccdeed52 - + https://github.com/dotnet/sdk - a2689ba4aacc5d91a0c5c801bb4a6ac5d55a771d + 658288fb352f997f35640a06a0d6abd5c829d852 - + https://github.com/dotnet/runtime - 4e278fe17f69ea31fbdcbab74ac47ec6fa84914b + 5ab200cd23f23baefc2d7189bf721075400fb7f2 diff --git a/eng/Versions.props b/eng/Versions.props index e73cd34276f..d4a86328f9a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -62,10 +62,10 @@ 9.0.0-preview.24324.1 - 9.0.0-preview.7.24357.2 - 9.0.0-preview.7.24357.2 + 9.0.0-preview.7.24363.5 + 9.0.0-preview.7.24363.5 - 9.0.100-preview.7.24362.28 + 9.0.100-preview.7.24365.8 1.0.536001 From 4c73864f60b057239a644528434023f108542364 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 16 Jul 2024 14:05:31 +0000 Subject: [PATCH 301/568] Update dependencies from https://github.com/dotnet/diagnostics build 20240715.1 (#6993) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 109a7536d0f..13789fb89f0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore 71b5ef3f5c997fbbb9ff3dc1a16d58e8ccdeed52 - + https://github.com/dotnet/diagnostics - 36f19c4904821895ca4d08969adb65b46964b3ce + b102d925ff9dd2ecd6e8c109108133e998e63bc5 - + https://github.com/dotnet/diagnostics - 36f19c4904821895ca4d08969adb65b46964b3ce + b102d925ff9dd2ecd6e8c109108133e998e63bc5 https://github.com/dotnet/command-line-api @@ -42,9 +42,9 @@ https://github.com/dotnet/arcade 731d793be2d0a66bafc96b1a79dc96b4d1f0301b - + https://github.com/dotnet/diagnostics - 36f19c4904821895ca4d08969adb65b46964b3ce + b102d925ff9dd2ecd6e8c109108133e998e63bc5 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index d4a86328f9a..9ec608584fb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24324.3 - 8.0.0-preview.24360.1 - 8.0.0-preview.24360.1 + 8.0.0-preview.24365.1 + 8.0.0-preview.24365.1 9.0.0-preview.24324.1 @@ -67,7 +67,7 @@ 9.0.100-preview.7.24365.8 - 1.0.536001 + 1.0.536501 $(MicrosoftNETCoreApp31Version) From a952ea3a54aa970fe9aa5cd2bd0b3a5768873d17 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 17 Jul 2024 09:20:28 -0700 Subject: [PATCH 302/568] [feature/9.x] Update dependencies from dotnet/sdk (#6994) * Update dependencies from https://github.com/dotnet/sdk build 20240716.2 VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0 From Version 9.0.100-preview.7.24365.8 -> To Version 9.0.100-preview.7.24366.2 Dependency coherency updates Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0 From Version 9.0.0-preview.7.24360.7 -> To Version 9.0.0-preview.7.24365.9 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0 * Update dependencies from https://github.com/dotnet/sdk build 20240717.10 VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0 From Version 9.0.100-preview.7.24365.8 -> To Version 9.0.100-preview.7.24367.10 Dependency coherency updates Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0 From Version 9.0.0-preview.7.24360.7 -> To Version 9.0.0-preview.7.24366.1 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0 --------- Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 13789fb89f0..a7b2606f5de 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/aspnetcore - 71b5ef3f5c997fbbb9ff3dc1a16d58e8ccdeed52 + 2d8a0742d8f70d627ae68b798939abba95caabdf https://github.com/dotnet/diagnostics @@ -46,21 +46,21 @@ https://github.com/dotnet/diagnostics b102d925ff9dd2ecd6e8c109108133e998e63bc5 - + https://github.com/dotnet/runtime - 5ab200cd23f23baefc2d7189bf721075400fb7f2 + b885a58062434707e7584d29910af429a1ee0107 - + https://github.com/dotnet/aspnetcore - 71b5ef3f5c997fbbb9ff3dc1a16d58e8ccdeed52 + 2d8a0742d8f70d627ae68b798939abba95caabdf - + https://github.com/dotnet/sdk - 658288fb352f997f35640a06a0d6abd5c829d852 + f5a5171ebb64cd3ea2a8bc53aa37c0a75218f49d - + https://github.com/dotnet/runtime - 5ab200cd23f23baefc2d7189bf721075400fb7f2 + b885a58062434707e7584d29910af429a1ee0107 diff --git a/eng/Versions.props b/eng/Versions.props index 9ec608584fb..915cd5c9752 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,8 +52,8 @@ 9.0.0-beta.24360.4 9.0.0-beta.24360.4 - 9.0.0-preview.7.24360.7 - 9.0.0-preview.7.24360.7 + 9.0.0-preview.7.24366.1 + 9.0.0-preview.7.24366.1 2.0.0-beta4.24324.3 @@ -62,10 +62,10 @@ 9.0.0-preview.24324.1 - 9.0.0-preview.7.24363.5 - 9.0.0-preview.7.24363.5 + 9.0.0-preview.7.24365.1 + 9.0.0-preview.7.24365.1 - 9.0.100-preview.7.24365.8 + 9.0.100-preview.7.24367.10 1.0.536501 From 077721465da03ea2fbd875e3d1af42a67e4595f7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 17 Jul 2024 17:04:19 +0000 Subject: [PATCH 303/568] Update dependencies from https://github.com/dotnet/diagnostics build 20240716.1 (#6998) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a7b2606f5de..da2c3883360 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore 2d8a0742d8f70d627ae68b798939abba95caabdf - + https://github.com/dotnet/diagnostics - b102d925ff9dd2ecd6e8c109108133e998e63bc5 + 885f0c7f1df47e49490e291d0f90fc28ad793082 - + https://github.com/dotnet/diagnostics - b102d925ff9dd2ecd6e8c109108133e998e63bc5 + 885f0c7f1df47e49490e291d0f90fc28ad793082 https://github.com/dotnet/command-line-api @@ -42,9 +42,9 @@ https://github.com/dotnet/arcade 731d793be2d0a66bafc96b1a79dc96b4d1f0301b - + https://github.com/dotnet/diagnostics - b102d925ff9dd2ecd6e8c109108133e998e63bc5 + 885f0c7f1df47e49490e291d0f90fc28ad793082 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 915cd5c9752..d365e6c6fc0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24324.3 - 8.0.0-preview.24365.1 - 8.0.0-preview.24365.1 + 8.0.0-preview.24366.1 + 8.0.0-preview.24366.1 9.0.0-preview.24324.1 @@ -67,7 +67,7 @@ 9.0.100-preview.7.24367.10 - 1.0.536501 + 1.0.536601 $(MicrosoftNETCoreApp31Version) From 332449d577396b35a04237974c123043710dc9b3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 18 Jul 2024 14:14:12 +0000 Subject: [PATCH 304/568] Update dependencies from https://github.com/dotnet/diagnostics build 20240717.1 (#7005) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index da2c3883360..4537a458837 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore 2d8a0742d8f70d627ae68b798939abba95caabdf - + https://github.com/dotnet/diagnostics - 885f0c7f1df47e49490e291d0f90fc28ad793082 + 43dfee306b35890dcb2cc1d443a9410d426e992a - + https://github.com/dotnet/diagnostics - 885f0c7f1df47e49490e291d0f90fc28ad793082 + 43dfee306b35890dcb2cc1d443a9410d426e992a https://github.com/dotnet/command-line-api @@ -42,9 +42,9 @@ https://github.com/dotnet/arcade 731d793be2d0a66bafc96b1a79dc96b4d1f0301b - + https://github.com/dotnet/diagnostics - 885f0c7f1df47e49490e291d0f90fc28ad793082 + 43dfee306b35890dcb2cc1d443a9410d426e992a https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index d365e6c6fc0..026757ac075 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24324.3 - 8.0.0-preview.24366.1 - 8.0.0-preview.24366.1 + 8.0.0-preview.24367.1 + 8.0.0-preview.24367.1 9.0.0-preview.24324.1 @@ -67,7 +67,7 @@ 9.0.100-preview.7.24367.10 - 1.0.536601 + 1.0.536701 $(MicrosoftNETCoreApp31Version) From fb3534990bf1ae50b54fe85ecf70d695b3dea7c0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 18 Jul 2024 14:14:36 +0000 Subject: [PATCH 305/568] Update dependencies from https://github.com/dotnet/arcade build 20240717.4 (#7006) [feature/9.x] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 +++++++++---------- eng/Versions.props | 6 +++--- .../steps/get-federated-access-token.yml | 16 ++++++++++++++- global.json | 4 ++-- 4 files changed, 30 insertions(+), 16 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4537a458837..ca124864fcd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,25 +22,25 @@ https://github.com/dotnet/roslyn-analyzers 43709af7570da7140fb3e9a5237f55ffb24677e7 - + https://github.com/dotnet/arcade - 731d793be2d0a66bafc96b1a79dc96b4d1f0301b + 9711d78c7efe6f542b764ef961697474043899e5 - + https://github.com/dotnet/arcade - 731d793be2d0a66bafc96b1a79dc96b4d1f0301b + 9711d78c7efe6f542b764ef961697474043899e5 - + https://github.com/dotnet/arcade - 731d793be2d0a66bafc96b1a79dc96b4d1f0301b + 9711d78c7efe6f542b764ef961697474043899e5 - + https://github.com/dotnet/arcade - 731d793be2d0a66bafc96b1a79dc96b4d1f0301b + 9711d78c7efe6f542b764ef961697474043899e5 - + https://github.com/dotnet/arcade - 731d793be2d0a66bafc96b1a79dc96b4d1f0301b + 9711d78c7efe6f542b764ef961697474043899e5 https://github.com/dotnet/diagnostics diff --git a/eng/Versions.props b/eng/Versions.props index 026757ac075..70365d3fbb1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,9 +48,9 @@ --> - 9.0.0-beta.24360.4 - 9.0.0-beta.24360.4 - 9.0.0-beta.24360.4 + 9.0.0-beta.24367.4 + 9.0.0-beta.24367.4 + 9.0.0-beta.24367.4 9.0.0-preview.7.24366.1 9.0.0-preview.7.24366.1 diff --git a/eng/common/core-templates/steps/get-federated-access-token.yml b/eng/common/core-templates/steps/get-federated-access-token.yml index c8c49cc0e8f..3a4d4410c48 100644 --- a/eng/common/core-templates/steps/get-federated-access-token.yml +++ b/eng/common/core-templates/steps/get-federated-access-token.yml @@ -3,6 +3,14 @@ parameters: type: string - name: outputVariableName type: string +- name: is1ESPipeline + type: boolean +- name: stepName + type: string + default: 'getFederatedAccessToken' +- name: condition + type: string + default: '' # Resource to get a token for. Common values include: # - '499b84ac-1321-427f-aa17-267ca6975798' for Azure DevOps # - 'https://storage.azure.com/' for storage @@ -10,10 +18,16 @@ parameters: - name: resource type: string default: '499b84ac-1321-427f-aa17-267ca6975798' +- name: isStepOutputVariable + type: boolean + default: false steps: - task: AzureCLI@2 displayName: 'Getting federated access token for feeds' + name: ${{ parameters.stepName }} + ${{ if ne(parameters.condition, '') }}: + condition: ${{ parameters.condition }} inputs: azureSubscription: ${{ parameters.federatedServiceConnection }} scriptType: 'pscore' @@ -25,4 +39,4 @@ steps: exit 1 } Write-Host "Setting '${{ parameters.outputVariableName }}' with the access token value" - Write-Host "##vso[task.setvariable variable=${{ parameters.outputVariableName }};issecret=true]$accessToken" \ No newline at end of file + Write-Host "##vso[task.setvariable variable=${{ parameters.outputVariableName }};issecret=true;isOutput=${{ parameters.isStepOutputVariable }}]$accessToken" \ No newline at end of file diff --git a/global.json b/global.json index be52ae7d038..f3ea8f0d9f2 100644 --- a/global.json +++ b/global.json @@ -31,7 +31,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24360.4", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24360.4" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24367.4", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24367.4" } } From fb19cc425fd669d848ad282939990c7f7935cb7e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 18 Jul 2024 14:23:14 +0000 Subject: [PATCH 306/568] Update dependencies from https://github.com/dotnet/sdk build 20240718.2 (#7008) [feature/9.x] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Runtime.win-x64: from 9.0.0-preview.7.24366.1 to 9.0.0-preview.7.24366.8 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) - Microsoft.NETCore.App.Runtime.win-x64: from 9.0.0-preview.7.24365.1 to 9.0.0-preview.7.24366.18 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) - VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0: from 9.0.0-preview.7.24366.1 to 9.0.0-preview.7.24366.8 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) - VS.Redist.Common.NetCore.SharedFramework.x64.9.0: from 9.0.0-preview.7.24365.1 to 9.0.0-preview.7.24366.18 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ca124864fcd..ac2717662ce 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/aspnetcore - 2d8a0742d8f70d627ae68b798939abba95caabdf + ec1594438c33702e564c36252ed11d024b5e6aad https://github.com/dotnet/diagnostics @@ -46,21 +46,21 @@ https://github.com/dotnet/diagnostics 43dfee306b35890dcb2cc1d443a9410d426e992a - + https://github.com/dotnet/runtime - b885a58062434707e7584d29910af429a1ee0107 + 1f70f0cc663b5d45f77840e9728386e5fa7944f9 - + https://github.com/dotnet/aspnetcore - 2d8a0742d8f70d627ae68b798939abba95caabdf + ec1594438c33702e564c36252ed11d024b5e6aad - + https://github.com/dotnet/sdk - f5a5171ebb64cd3ea2a8bc53aa37c0a75218f49d + 0344f9c42c91aae0d09b99d7724adac0d04fb3ef - + https://github.com/dotnet/runtime - b885a58062434707e7584d29910af429a1ee0107 + 1f70f0cc663b5d45f77840e9728386e5fa7944f9 diff --git a/eng/Versions.props b/eng/Versions.props index 70365d3fbb1..e578cfd1eba 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,8 +52,8 @@ 9.0.0-beta.24367.4 9.0.0-beta.24367.4 - 9.0.0-preview.7.24366.1 - 9.0.0-preview.7.24366.1 + 9.0.0-preview.7.24366.8 + 9.0.0-preview.7.24366.8 2.0.0-beta4.24324.3 @@ -62,10 +62,10 @@ 9.0.0-preview.24324.1 - 9.0.0-preview.7.24365.1 - 9.0.0-preview.7.24365.1 + 9.0.0-preview.7.24366.18 + 9.0.0-preview.7.24366.18 - 9.0.100-preview.7.24367.10 + 9.0.100-preview.7.24368.2 1.0.536701 From 139beb5649bd62c98e2943df2b690771c4f2fac0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 19 Jul 2024 14:21:02 +0000 Subject: [PATCH 307/568] Update dependencies from https://github.com/dotnet/arcade build 20240718.9 (#7012) [feature/9.x] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 +++++++++---------- eng/Versions.props | 6 +++--- .../job/publish-build-assets.yml | 5 +++-- .../core-templates/post-build/post-build.yml | 5 +++-- .../core-templates/steps/publish-logs.yml | 1 - eng/common/post-build/publish-using-darc.ps1 | 1 + global.json | 4 ++-- 7 files changed, 22 insertions(+), 20 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ac2717662ce..447b3f59aa9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,25 +22,25 @@ https://github.com/dotnet/roslyn-analyzers 43709af7570da7140fb3e9a5237f55ffb24677e7 - + https://github.com/dotnet/arcade - 9711d78c7efe6f542b764ef961697474043899e5 + b4e499d1f6e6b3a981feabfed290d99261762382 - + https://github.com/dotnet/arcade - 9711d78c7efe6f542b764ef961697474043899e5 + b4e499d1f6e6b3a981feabfed290d99261762382 - + https://github.com/dotnet/arcade - 9711d78c7efe6f542b764ef961697474043899e5 + b4e499d1f6e6b3a981feabfed290d99261762382 - + https://github.com/dotnet/arcade - 9711d78c7efe6f542b764ef961697474043899e5 + b4e499d1f6e6b3a981feabfed290d99261762382 - + https://github.com/dotnet/arcade - 9711d78c7efe6f542b764ef961697474043899e5 + b4e499d1f6e6b3a981feabfed290d99261762382 https://github.com/dotnet/diagnostics diff --git a/eng/Versions.props b/eng/Versions.props index e578cfd1eba..27cae7bae59 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,9 +48,9 @@ --> - 9.0.0-beta.24367.4 - 9.0.0-beta.24367.4 - 9.0.0-beta.24367.4 + 9.0.0-beta.24368.9 + 9.0.0-beta.24368.9 + 9.0.0-beta.24368.9 9.0.0-preview.7.24366.8 9.0.0-preview.7.24366.8 diff --git a/eng/common/core-templates/job/publish-build-assets.yml b/eng/common/core-templates/job/publish-build-assets.yml index ec3cd14191a..3d3356e3196 100644 --- a/eng/common/core-templates/job/publish-build-assets.yml +++ b/eng/common/core-templates/job/publish-build-assets.yml @@ -143,9 +143,10 @@ jobs: scriptType: ps scriptLocation: scriptPath scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 - arguments: -BuildId $(BARBuildId) + arguments: > + -BuildId $(BARBuildId) -PublishingInfraVersion 3 - -AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)' + -AzdoToken '$(System.AccessToken)' -WaitPublishingFinish true -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' diff --git a/eng/common/core-templates/post-build/post-build.yml b/eng/common/core-templates/post-build/post-build.yml index 20924366b8a..454fd75c7af 100644 --- a/eng/common/core-templates/post-build/post-build.yml +++ b/eng/common/core-templates/post-build/post-build.yml @@ -307,9 +307,10 @@ stages: scriptType: ps scriptLocation: scriptPath scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 - arguments: -BuildId $(BARBuildId) + arguments: > + -BuildId $(BARBuildId) -PublishingInfraVersion ${{ parameters.publishingInfraVersion }} - -AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)' + -AzdoToken '$(System.AccessToken)' -WaitPublishingFinish true -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' diff --git a/eng/common/core-templates/steps/publish-logs.yml b/eng/common/core-templates/steps/publish-logs.yml index 8c5ea77b586..80788c52319 100644 --- a/eng/common/core-templates/steps/publish-logs.yml +++ b/eng/common/core-templates/steps/publish-logs.yml @@ -32,7 +32,6 @@ steps: '$(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)' diff --git a/eng/common/post-build/publish-using-darc.ps1 b/eng/common/post-build/publish-using-darc.ps1 index 4ff587ca46a..90b58e32a87 100644 --- a/eng/common/post-build/publish-using-darc.ps1 +++ b/eng/common/post-build/publish-using-darc.ps1 @@ -42,6 +42,7 @@ try { --azdev-pat "$AzdoToken" ` --bar-uri "$MaestroApiEndPoint" ` --ci ` + --verbose ` @optionalParams if ($LastExitCode -ne 0) { diff --git a/global.json b/global.json index f3ea8f0d9f2..dae32476953 100644 --- a/global.json +++ b/global.json @@ -31,7 +31,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24367.4", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24367.4" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24368.9", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24368.9" } } From 47b24447c227aa25ac8bc6fe66b31f52c009ea72 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 20 Jul 2024 14:43:03 +0000 Subject: [PATCH 308/568] Update dependencies from https://github.com/dotnet/diagnostics build 20240719.1 (#7015) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 447b3f59aa9..bc26ec6e017 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore ec1594438c33702e564c36252ed11d024b5e6aad - + https://github.com/dotnet/diagnostics - 43dfee306b35890dcb2cc1d443a9410d426e992a + ed1f445df93aca5e2a184135ddbb1a09757372a7 - + https://github.com/dotnet/diagnostics - 43dfee306b35890dcb2cc1d443a9410d426e992a + ed1f445df93aca5e2a184135ddbb1a09757372a7 https://github.com/dotnet/command-line-api @@ -42,9 +42,9 @@ https://github.com/dotnet/arcade b4e499d1f6e6b3a981feabfed290d99261762382 - + https://github.com/dotnet/diagnostics - 43dfee306b35890dcb2cc1d443a9410d426e992a + ed1f445df93aca5e2a184135ddbb1a09757372a7 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 27cae7bae59..fc918e300cb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24324.3 - 8.0.0-preview.24367.1 - 8.0.0-preview.24367.1 + 8.0.0-preview.24369.1 + 8.0.0-preview.24369.1 9.0.0-preview.24324.1 @@ -67,7 +67,7 @@ 9.0.100-preview.7.24368.2 - 1.0.536701 + 1.0.536901 $(MicrosoftNETCoreApp31Version) From 43188708869116777378ba5969880e4fd3dbfe75 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 22 Jul 2024 10:08:44 -0700 Subject: [PATCH 309/568] [feature/9.x] Update dependencies from dotnet/sdk (#7013) * Update dependencies from https://github.com/dotnet/sdk build 20240718.5 VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0 From Version 9.0.100-preview.7.24368.2 -> To Version 9.0.100-preview.7.24368.5 * Update dependencies from https://github.com/dotnet/sdk build 20240719.5 VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0 From Version 9.0.100-preview.7.24368.2 -> To Version 9.0.100-preview.7.24369.5 Dependency coherency updates Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0 From Version 9.0.0-preview.7.24366.8 -> To Version 9.0.0-preview.7.24368.11 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0 * Update dependencies from https://github.com/dotnet/sdk build 20240721.2 VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0 From Version 9.0.100-preview.7.24368.2 -> To Version 9.0.100-preview.7.24371.2 Dependency coherency updates Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0 From Version 9.0.0-preview.7.24366.8 -> To Version 9.0.0-preview.7.24368.11 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0 * Update dependencies from https://github.com/dotnet/sdk build 20240721.4 VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0 From Version 9.0.100-preview.7.24368.2 -> To Version 9.0.100-preview.7.24371.4 Dependency coherency updates Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0 From Version 9.0.0-preview.7.24366.8 -> To Version 9.0.0-preview.7.24369.10 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0 --------- Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bc26ec6e017..dfde7c0d1f7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/aspnetcore - ec1594438c33702e564c36252ed11d024b5e6aad + 0e1746baca1748e2d197b17533af6e122dcfdc28 https://github.com/dotnet/diagnostics @@ -50,13 +50,13 @@ https://github.com/dotnet/runtime 1f70f0cc663b5d45f77840e9728386e5fa7944f9 - + https://github.com/dotnet/aspnetcore - ec1594438c33702e564c36252ed11d024b5e6aad + 0e1746baca1748e2d197b17533af6e122dcfdc28 - + https://github.com/dotnet/sdk - 0344f9c42c91aae0d09b99d7724adac0d04fb3ef + 29904b25a99c8984bacb86473df7d98735fb3207 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index fc918e300cb..9c9eecc951a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,8 +52,8 @@ 9.0.0-beta.24368.9 9.0.0-beta.24368.9 - 9.0.0-preview.7.24366.8 - 9.0.0-preview.7.24366.8 + 9.0.0-preview.7.24369.10 + 9.0.0-preview.7.24369.10 2.0.0-beta4.24324.3 @@ -65,7 +65,7 @@ 9.0.0-preview.7.24366.18 9.0.0-preview.7.24366.18 - 9.0.100-preview.7.24368.2 + 9.0.100-preview.7.24371.4 1.0.536901 From 9ed3b453e75971887baac79c428edfb4404201c8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 23 Jul 2024 14:52:19 +0000 Subject: [PATCH 310/568] Update dependencies from https://github.com/dotnet/arcade build 20240722.7 (#7023) [feature/9.x] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 +++---- eng/Versions.props | 6 +- .../job/source-index-stage1.yml | 6 +- eng/common/native/init-compiler.sh | 56 +++++++------------ global.json | 4 +- 5 files changed, 39 insertions(+), 53 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dfde7c0d1f7..a146b330b23 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,25 +22,25 @@ https://github.com/dotnet/roslyn-analyzers 43709af7570da7140fb3e9a5237f55ffb24677e7 - + https://github.com/dotnet/arcade - b4e499d1f6e6b3a981feabfed290d99261762382 + 4dc25182f9153b892628ef0d4e98663774ad2f01 - + https://github.com/dotnet/arcade - b4e499d1f6e6b3a981feabfed290d99261762382 + 4dc25182f9153b892628ef0d4e98663774ad2f01 - + https://github.com/dotnet/arcade - b4e499d1f6e6b3a981feabfed290d99261762382 + 4dc25182f9153b892628ef0d4e98663774ad2f01 - + https://github.com/dotnet/arcade - b4e499d1f6e6b3a981feabfed290d99261762382 + 4dc25182f9153b892628ef0d4e98663774ad2f01 - + https://github.com/dotnet/arcade - b4e499d1f6e6b3a981feabfed290d99261762382 + 4dc25182f9153b892628ef0d4e98663774ad2f01 https://github.com/dotnet/diagnostics diff --git a/eng/Versions.props b/eng/Versions.props index 9c9eecc951a..11a1f457581 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,9 +48,9 @@ --> - 9.0.0-beta.24368.9 - 9.0.0-beta.24368.9 - 9.0.0-beta.24368.9 + 9.0.0-beta.24372.7 + 9.0.0-beta.24372.7 + 9.0.0-beta.24372.7 9.0.0-preview.7.24369.10 9.0.0-preview.7.24369.10 diff --git a/eng/common/core-templates/job/source-index-stage1.yml b/eng/common/core-templates/job/source-index-stage1.yml index 945c1c19e82..205fb5b3a39 100644 --- a/eng/common/core-templates/job/source-index-stage1.yml +++ b/eng/common/core-templates/job/source-index-stage1.yml @@ -34,10 +34,12 @@ jobs: pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: name: $(DncEngPublicBuildPool) - image: windows.vs2022.amd64.open + image: 1es-windows-2022-open + os: windows ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: $(DncEngInternalBuildPool) - image: windows.vs2022.amd64 + image: 1es-windows-2022 + os: windows steps: - ${{ if eq(parameters.is1ESPipeline, '') }}: diff --git a/eng/common/native/init-compiler.sh b/eng/common/native/init-compiler.sh index 62900e12b21..14175343cc6 100644 --- a/eng/common/native/init-compiler.sh +++ b/eng/common/native/init-compiler.sh @@ -19,11 +19,9 @@ case "$compiler" in # clangx.y or clang-x.y version="$(echo "$compiler" | tr -d '[:alpha:]-=')" majorVersion="${version%%.*}" - [ -z "${version##*.*}" ] && minorVersion="${version#*.}" - if [ -z "$minorVersion" ] && [ -n "$majorVersion" ] && [ "$majorVersion" -le 6 ]; then - minorVersion=0; - fi + # LLVM based on v18 released in early 2024, with two releases per year + maxVersion="$((18 + ((($(date +%Y) - 2024) * 12 + $(date +%m) - 3) / 6)))" compiler=clang ;; @@ -31,7 +29,9 @@ case "$compiler" in # gccx.y or gcc-x.y version="$(echo "$compiler" | tr -d '[:alpha:]-=')" majorVersion="${version%%.*}" - [ -z "${version##*.*}" ] && minorVersion="${version#*.}" + + # GCC based on v14 released in early 2024, with one release per year + maxVersion="$((14 + ((($(date +%Y) - 2024) * 12 + $(date +%m) - 3) / 12)))" compiler=gcc ;; esac @@ -49,12 +49,10 @@ check_version_exists() { desired_version=-1 # Set up the environment to be used for building with the desired compiler. - if command -v "$compiler-$1.$2" > /dev/null; then - desired_version="-$1.$2" - elif command -v "$compiler$1$2" > /dev/null; then - desired_version="$1$2" - elif command -v "$compiler-$1$2" > /dev/null; then - desired_version="-$1$2" + if command -v "$compiler-$1" > /dev/null; then + desired_version="-$1" + elif command -v "$compiler$1" > /dev/null; then + desired_version="$1" fi echo "$desired_version" @@ -75,7 +73,7 @@ set_compiler_version_from_CC() { fi # gcc and clang often display 3 part versions. However, gcc can show only 1 part in some environments. - IFS=. read -r majorVersion minorVersion _ < /dev/null; then - echo "Error: No usable version of $compiler found." + echo "Error: No compatible version of $compiler was found within the range of $minVersion to $maxVersion. Please upgrade your toolchain or specify the compiler explicitly using CLR_CC and CLR_CXX environment variables." exit 1 fi CC="$(command -v "$compiler" 2> /dev/null)" CXX="$(command -v "$cxxCompiler" 2> /dev/null)" set_compiler_version_from_CC - else - if [ "$compiler" = "clang" ] && [ "$majorVersion" -lt 5 ] && { [ "$build_arch" = "arm" ] || [ "$build_arch" = "armel" ]; }; then - # If a major version was provided explicitly, and it was too old, find a newer compiler instead - if ! command -v "$compiler" > /dev/null; then - echo "Error: Found clang version $majorVersion which is not supported on arm/armel architectures, and there is no clang in PATH." - exit 1 - fi - - CC="$(command -v "$compiler" 2> /dev/null)" - CXX="$(command -v "$cxxCompiler" 2> /dev/null)" - set_compiler_version_from_CC - fi fi else - desired_version="$(check_version_exists "$majorVersion" "$minorVersion")" + desired_version="$(check_version_exists "$majorVersion")" if [ "$desired_version" = "-1" ]; then - echo "Error: Could not find specific version of $compiler: $majorVersion $minorVersion." + echo "Error: Could not find specific version of $compiler: $majorVersion." exit 1 fi fi diff --git a/global.json b/global.json index dae32476953..a2240e176fa 100644 --- a/global.json +++ b/global.json @@ -31,7 +31,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24368.9", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24368.9" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24372.7", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24372.7" } } From 3aa629ee50ac03988e1908f9ea55b35987b60d9a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 23 Jul 2024 14:52:39 +0000 Subject: [PATCH 311/568] Update dependencies from https://github.com/dotnet/diagnostics build 20240722.1 (#7022) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a146b330b23..a1caff51fa2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore 0e1746baca1748e2d197b17533af6e122dcfdc28 - + https://github.com/dotnet/diagnostics - ed1f445df93aca5e2a184135ddbb1a09757372a7 + 3757f57aadff61743d416faab8554952e4dadf9e - + https://github.com/dotnet/diagnostics - ed1f445df93aca5e2a184135ddbb1a09757372a7 + 3757f57aadff61743d416faab8554952e4dadf9e https://github.com/dotnet/command-line-api @@ -42,9 +42,9 @@ https://github.com/dotnet/arcade 4dc25182f9153b892628ef0d4e98663774ad2f01 - + https://github.com/dotnet/diagnostics - ed1f445df93aca5e2a184135ddbb1a09757372a7 + 3757f57aadff61743d416faab8554952e4dadf9e https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 11a1f457581..eb95e9d52ee 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24324.3 - 8.0.0-preview.24369.1 - 8.0.0-preview.24369.1 + 8.0.0-preview.24372.1 + 8.0.0-preview.24372.1 9.0.0-preview.24324.1 @@ -67,7 +67,7 @@ 9.0.100-preview.7.24371.4 - 1.0.536901 + 1.0.537201 $(MicrosoftNETCoreApp31Version) From c7e0767e20eaf38c37404c69ec8b7178f374911d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 23 Jul 2024 14:52:55 +0000 Subject: [PATCH 312/568] Update dependencies from https://github.com/dotnet/sdk build 20240723.4 (#7025) [feature/9.x] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Runtime.win-x64: from 9.0.0-preview.7.24369.10 to 9.0.0-preview.7.24372.2 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) - VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0: from 9.0.0-preview.7.24369.10 to 9.0.0-preview.7.24372.2 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a1caff51fa2..31e554ed3bd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/aspnetcore - 0e1746baca1748e2d197b17533af6e122dcfdc28 + 65cc716fa9d4c4c87d0de40caadc6e9b1c000c3e https://github.com/dotnet/diagnostics @@ -50,13 +50,13 @@ https://github.com/dotnet/runtime 1f70f0cc663b5d45f77840e9728386e5fa7944f9 - + https://github.com/dotnet/aspnetcore - 0e1746baca1748e2d197b17533af6e122dcfdc28 + 65cc716fa9d4c4c87d0de40caadc6e9b1c000c3e - + https://github.com/dotnet/sdk - 29904b25a99c8984bacb86473df7d98735fb3207 + 11bdcefb577a153c2ed85cde156552f0e1953a94 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index eb95e9d52ee..ccb0dbad12a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,8 +52,8 @@ 9.0.0-beta.24372.7 9.0.0-beta.24372.7 - 9.0.0-preview.7.24369.10 - 9.0.0-preview.7.24369.10 + 9.0.0-preview.7.24372.2 + 9.0.0-preview.7.24372.2 2.0.0-beta4.24324.3 @@ -65,7 +65,7 @@ 9.0.0-preview.7.24366.18 9.0.0-preview.7.24366.18 - 9.0.100-preview.7.24371.4 + 9.0.100-preview.7.24373.4 1.0.537201 From 784e3c7654b7da15b926ef588df162d0bcaae893 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 24 Jul 2024 14:23:07 +0000 Subject: [PATCH 313/568] Update dependencies from https://github.com/dotnet/sdk build 20240724.4 (#7027) [feature/9.x] Update dependencies from dotnet/sdk --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 31e554ed3bd..3f9309efe6c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,9 +54,9 @@ https://github.com/dotnet/aspnetcore 65cc716fa9d4c4c87d0de40caadc6e9b1c000c3e - + https://github.com/dotnet/sdk - 11bdcefb577a153c2ed85cde156552f0e1953a94 + 8d29338f5cadf66217178e2927634e85fd8718b5 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index ccb0dbad12a..28875c09e26 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,7 +65,7 @@ 9.0.0-preview.7.24366.18 9.0.0-preview.7.24366.18 - 9.0.100-preview.7.24373.4 + 9.0.100-preview.7.24374.4 1.0.537201 From e50531797807bb4b74648cc7917bbe477e9925c6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 25 Jul 2024 14:16:53 +0000 Subject: [PATCH 314/568] Update dependencies from https://github.com/dotnet/diagnostics build 20240724.1 (#7032) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3f9309efe6c..9ea5af9b844 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore 65cc716fa9d4c4c87d0de40caadc6e9b1c000c3e - + https://github.com/dotnet/diagnostics - 3757f57aadff61743d416faab8554952e4dadf9e + ae44de5295e6337c9f7adc20890a19c3a21a7545 - + https://github.com/dotnet/diagnostics - 3757f57aadff61743d416faab8554952e4dadf9e + ae44de5295e6337c9f7adc20890a19c3a21a7545 https://github.com/dotnet/command-line-api @@ -42,9 +42,9 @@ https://github.com/dotnet/arcade 4dc25182f9153b892628ef0d4e98663774ad2f01 - + https://github.com/dotnet/diagnostics - 3757f57aadff61743d416faab8554952e4dadf9e + ae44de5295e6337c9f7adc20890a19c3a21a7545 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 28875c09e26..e954fc8277e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24324.3 - 8.0.0-preview.24372.1 - 8.0.0-preview.24372.1 + 8.0.0-preview.24374.1 + 8.0.0-preview.24374.1 9.0.0-preview.24324.1 @@ -67,7 +67,7 @@ 9.0.100-preview.7.24374.4 - 1.0.537201 + 1.0.537401 $(MicrosoftNETCoreApp31Version) From 94db61066063a84c04f668bbce39e825d10088b3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 25 Jul 2024 14:27:43 +0000 Subject: [PATCH 315/568] Update dependencies from https://github.com/dotnet/arcade build 20240724.3 (#7033) [feature/9.x] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- global.json | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9ea5af9b844..b53cdf26702 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,25 +22,25 @@ https://github.com/dotnet/roslyn-analyzers 43709af7570da7140fb3e9a5237f55ffb24677e7 - + https://github.com/dotnet/arcade - 4dc25182f9153b892628ef0d4e98663774ad2f01 + c45d41114722ff910cde462f4be003b1d7fde58f - + https://github.com/dotnet/arcade - 4dc25182f9153b892628ef0d4e98663774ad2f01 + c45d41114722ff910cde462f4be003b1d7fde58f - + https://github.com/dotnet/arcade - 4dc25182f9153b892628ef0d4e98663774ad2f01 + c45d41114722ff910cde462f4be003b1d7fde58f - + https://github.com/dotnet/arcade - 4dc25182f9153b892628ef0d4e98663774ad2f01 + c45d41114722ff910cde462f4be003b1d7fde58f - + https://github.com/dotnet/arcade - 4dc25182f9153b892628ef0d4e98663774ad2f01 + c45d41114722ff910cde462f4be003b1d7fde58f https://github.com/dotnet/diagnostics diff --git a/eng/Versions.props b/eng/Versions.props index e954fc8277e..cf5ed207a7d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,9 +48,9 @@ --> - 9.0.0-beta.24372.7 - 9.0.0-beta.24372.7 - 9.0.0-beta.24372.7 + 9.0.0-beta.24374.3 + 9.0.0-beta.24374.3 + 9.0.0-beta.24374.3 9.0.0-preview.7.24372.2 9.0.0-preview.7.24372.2 diff --git a/global.json b/global.json index a2240e176fa..a11a8f68ec8 100644 --- a/global.json +++ b/global.json @@ -31,7 +31,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24372.7", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24372.7" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24374.3", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24374.3" } } From baeaf07e4b289de63487a7d45b854639b9112932 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 25 Jul 2024 14:31:59 +0000 Subject: [PATCH 316/568] Update dependencies from https://github.com/dotnet/sdk build 20240725.4 (#7034) [feature/9.x] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Runtime.win-x64: from 9.0.0-preview.7.24372.2 to 9.0.0-rc.1.24374.2 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) - VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0: from 9.0.0-preview.7.24372.2 to 9.0.0-rc.1.24374.2 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b53cdf26702..2dbf8a29caa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/aspnetcore - 65cc716fa9d4c4c87d0de40caadc6e9b1c000c3e + e7fa345782a0e705c05a863f11a131dbff06265d https://github.com/dotnet/diagnostics @@ -50,13 +50,13 @@ https://github.com/dotnet/runtime 1f70f0cc663b5d45f77840e9728386e5fa7944f9 - + https://github.com/dotnet/aspnetcore - 65cc716fa9d4c4c87d0de40caadc6e9b1c000c3e + e7fa345782a0e705c05a863f11a131dbff06265d - + https://github.com/dotnet/sdk - 8d29338f5cadf66217178e2927634e85fd8718b5 + 8fcbaac1e96fa740af46c9e766c5a4d54e59fe75 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index cf5ed207a7d..eb663a8e464 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,8 +52,8 @@ 9.0.0-beta.24374.3 9.0.0-beta.24374.3 - 9.0.0-preview.7.24372.2 - 9.0.0-preview.7.24372.2 + 9.0.0-rc.1.24374.2 + 9.0.0-rc.1.24374.2 2.0.0-beta4.24324.3 @@ -65,7 +65,7 @@ 9.0.0-preview.7.24366.18 9.0.0-preview.7.24366.18 - 9.0.100-preview.7.24374.4 + 9.0.100-preview.7.24375.4 1.0.537401 From 06c5daae22e6467ab248112004baa3a0464f57db Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 26 Jul 2024 14:28:25 +0000 Subject: [PATCH 317/568] Update dependencies from https://github.com/dotnet/arcade build 20240725.3 (#7042) [feature/9.x] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- eng/common/cross/build-rootfs.sh | 14 +++++++------- global.json | 4 ++-- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2dbf8a29caa..ff744e58b52 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,25 +22,25 @@ https://github.com/dotnet/roslyn-analyzers 43709af7570da7140fb3e9a5237f55ffb24677e7 - + https://github.com/dotnet/arcade - c45d41114722ff910cde462f4be003b1d7fde58f + 3e18bd4f62388b829d0b9dcd1ee131431674aa5f - + https://github.com/dotnet/arcade - c45d41114722ff910cde462f4be003b1d7fde58f + 3e18bd4f62388b829d0b9dcd1ee131431674aa5f - + https://github.com/dotnet/arcade - c45d41114722ff910cde462f4be003b1d7fde58f + 3e18bd4f62388b829d0b9dcd1ee131431674aa5f - + https://github.com/dotnet/arcade - c45d41114722ff910cde462f4be003b1d7fde58f + 3e18bd4f62388b829d0b9dcd1ee131431674aa5f - + https://github.com/dotnet/arcade - c45d41114722ff910cde462f4be003b1d7fde58f + 3e18bd4f62388b829d0b9dcd1ee131431674aa5f https://github.com/dotnet/diagnostics diff --git a/eng/Versions.props b/eng/Versions.props index eb663a8e464..4e7c0f42f7b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,9 +48,9 @@ --> - 9.0.0-beta.24374.3 - 9.0.0-beta.24374.3 - 9.0.0-beta.24374.3 + 9.0.0-beta.24375.3 + 9.0.0-beta.24375.3 + 9.0.0-beta.24375.3 9.0.0-rc.1.24374.2 9.0.0-rc.1.24374.2 diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index 6d99d1263c0..4b5e8d7166b 100644 --- a/eng/common/cross/build-rootfs.sh +++ b/eng/common/cross/build-rootfs.sh @@ -605,18 +605,18 @@ elif [[ "$__CodeName" == "illumos" ]]; then fi echo "Building binutils. Please wait.." if [[ "$__hasWget" == 1 ]]; then - wget -O- https://ftp.gnu.org/gnu/binutils/binutils-2.33.1.tar.bz2 | tar -xjf - + wget -O- https://ftp.gnu.org/gnu/binutils/binutils-2.42.tar.xz | tar -xJf - else - curl -SL https://ftp.gnu.org/gnu/binutils/binutils-2.33.1.tar.bz2 | tar -xjf - + curl -SL https://ftp.gnu.org/gnu/binutils/binutils-2.42.tar.xz | tar -xJf - fi mkdir build-binutils && cd build-binutils - ../binutils-2.33.1/configure --prefix="$__RootfsDir" --target="${__illumosArch}-sun-solaris2.10" --program-prefix="${__illumosArch}-illumos-" --with-sysroot="$__RootfsDir" + ../binutils-2.42/configure --prefix="$__RootfsDir" --target="${__illumosArch}-sun-solaris2.11" --program-prefix="${__illumosArch}-illumos-" --with-sysroot="$__RootfsDir" make -j "$JOBS" && make install && cd .. echo "Building gcc. Please wait.." if [[ "$__hasWget" == 1 ]]; then - wget -O- https://ftp.gnu.org/gnu/gcc/gcc-8.4.0/gcc-8.4.0.tar.xz | tar -xJf - + wget -O- https://ftp.gnu.org/gnu/gcc/gcc-13.3.0/gcc-13.3.0.tar.xz | tar -xJf - else - curl -SL https://ftp.gnu.org/gnu/gcc/gcc-8.4.0/gcc-8.4.0.tar.xz | tar -xJf - + curl -SL https://ftp.gnu.org/gnu/gcc/gcc-13.3.0/gcc-13.3.0.tar.xz | tar -xJf - fi CFLAGS="-fPIC" CXXFLAGS="-fPIC" @@ -624,7 +624,7 @@ elif [[ "$__CodeName" == "illumos" ]]; then CFLAGS_FOR_TARGET="-fPIC" export CFLAGS CXXFLAGS CXXFLAGS_FOR_TARGET CFLAGS_FOR_TARGET mkdir build-gcc && cd build-gcc - ../gcc-8.4.0/configure --prefix="$__RootfsDir" --target="${__illumosArch}-sun-solaris2.10" --program-prefix="${__illumosArch}-illumos-" --with-sysroot="$__RootfsDir" --with-gnu-as \ + ../gcc-13.3.0/configure --prefix="$__RootfsDir" --target="${__illumosArch}-sun-solaris2.11" --program-prefix="${__illumosArch}-illumos-" --with-sysroot="$__RootfsDir" --with-gnu-as \ --with-gnu-ld --disable-nls --disable-libgomp --disable-libquadmath --disable-libssp --disable-libvtv --disable-libcilkrts --disable-libada --disable-libsanitizer \ --disable-libquadmath-support --disable-shared --enable-tls make -j "$JOBS" && make install && cd .. @@ -632,7 +632,7 @@ elif [[ "$__CodeName" == "illumos" ]]; then if [[ "$__UseMirror" == 1 ]]; then BaseUrl=https://pkgsrc.smartos.skylime.net fi - BaseUrl="$BaseUrl/packages/SmartOS/trunk/${__illumosArch}/All" + BaseUrl="$BaseUrl/packages/SmartOS/2019Q4/${__illumosArch}/All" echo "Downloading manifest" if [[ "$__hasWget" == 1 ]]; then wget "$BaseUrl" diff --git a/global.json b/global.json index a11a8f68ec8..c2125fb3a8d 100644 --- a/global.json +++ b/global.json @@ -31,7 +31,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24374.3", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24374.3" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24375.3", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24375.3" } } From 743d3d46fc85cd576e041e6a829062308927c653 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 26 Jul 2024 14:35:34 +0000 Subject: [PATCH 318/568] Update dependencies from https://github.com/dotnet/sdk build 20240726.5 (#7044) [feature/9.x] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Runtime.win-x64: from 9.0.0-rc.1.24374.2 to 9.0.0-rc.1.24375.10 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) - VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0: from 9.0.0-rc.1.24374.2 to 9.0.0-rc.1.24375.10 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ff744e58b52..f9c483454ef 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/aspnetcore - e7fa345782a0e705c05a863f11a131dbff06265d + 98ee50279acfacff2b4ae4b6863956f3c65f34b2 https://github.com/dotnet/diagnostics @@ -50,13 +50,13 @@ https://github.com/dotnet/runtime 1f70f0cc663b5d45f77840e9728386e5fa7944f9 - + https://github.com/dotnet/aspnetcore - e7fa345782a0e705c05a863f11a131dbff06265d + 98ee50279acfacff2b4ae4b6863956f3c65f34b2 - + https://github.com/dotnet/sdk - 8fcbaac1e96fa740af46c9e766c5a4d54e59fe75 + ea13b1adbfbfe155ae242d42bff7febee0dbb27f https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 4e7c0f42f7b..009924180eb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,8 +52,8 @@ 9.0.0-beta.24375.3 9.0.0-beta.24375.3 - 9.0.0-rc.1.24374.2 - 9.0.0-rc.1.24374.2 + 9.0.0-rc.1.24375.10 + 9.0.0-rc.1.24375.10 2.0.0-beta4.24324.3 @@ -65,7 +65,7 @@ 9.0.0-preview.7.24366.18 9.0.0-preview.7.24366.18 - 9.0.100-preview.7.24375.4 + 9.0.100-preview.7.24376.5 1.0.537401 From af496e30db1b22e267a465fb9e982a687485ba3c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 27 Jul 2024 14:26:38 +0000 Subject: [PATCH 319/568] Update dependencies from https://github.com/dotnet/sdk build 20240727.4 (#7046) [feature/9.x] Update dependencies from dotnet/sdk --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f9c483454ef..9599ffef1f4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,9 +54,9 @@ https://github.com/dotnet/aspnetcore 98ee50279acfacff2b4ae4b6863956f3c65f34b2 - + https://github.com/dotnet/sdk - ea13b1adbfbfe155ae242d42bff7febee0dbb27f + 74dafbfb0c0d311595da6fc61d24ca57e6d3f80d https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 009924180eb..2569ca051d1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,7 +65,7 @@ 9.0.0-preview.7.24366.18 9.0.0-preview.7.24366.18 - 9.0.100-preview.7.24376.5 + 9.0.100-rc.1.24377.4 1.0.537401 From 1573fc9d51c9b8136e9c4fce312fe54edcb9872e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 28 Jul 2024 14:37:26 +0000 Subject: [PATCH 320/568] Update dependencies from https://github.com/dotnet/sdk build 20240727.5 (#7048) [feature/9.x] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Runtime.win-x64: from 9.0.0-rc.1.24375.10 to 9.0.0-rc.1.24376.4 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) - Microsoft.NETCore.App.Runtime.win-x64: from 9.0.0-preview.7.24366.18 to 9.0.0-rc.1.24376.16 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) - VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0: from 9.0.0-rc.1.24375.10 to 9.0.0-rc.1.24376.4 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) - VS.Redist.Common.NetCore.SharedFramework.x64.9.0: from 9.0.0-preview.7.24366.18 to 9.0.0-rc.1.24376.16 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9599ffef1f4..d8d33e6ba4d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/aspnetcore - 98ee50279acfacff2b4ae4b6863956f3c65f34b2 + 25db9495d1c3a84667f62fe62d9b7c0c6db5dcb9 https://github.com/dotnet/diagnostics @@ -46,21 +46,21 @@ https://github.com/dotnet/diagnostics ae44de5295e6337c9f7adc20890a19c3a21a7545 - + https://github.com/dotnet/runtime - 1f70f0cc663b5d45f77840e9728386e5fa7944f9 + 827c83497bf4eb9816de2c223ea5c054e19954af - + https://github.com/dotnet/aspnetcore - 98ee50279acfacff2b4ae4b6863956f3c65f34b2 + 25db9495d1c3a84667f62fe62d9b7c0c6db5dcb9 - + https://github.com/dotnet/sdk - 74dafbfb0c0d311595da6fc61d24ca57e6d3f80d + 1b87a11061f4447cf0437aa7193df545c749f352 - + https://github.com/dotnet/runtime - 1f70f0cc663b5d45f77840e9728386e5fa7944f9 + 827c83497bf4eb9816de2c223ea5c054e19954af diff --git a/eng/Versions.props b/eng/Versions.props index 2569ca051d1..cd3f355fbb6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,8 +52,8 @@ 9.0.0-beta.24375.3 9.0.0-beta.24375.3 - 9.0.0-rc.1.24375.10 - 9.0.0-rc.1.24375.10 + 9.0.0-rc.1.24376.4 + 9.0.0-rc.1.24376.4 2.0.0-beta4.24324.3 @@ -62,10 +62,10 @@ 9.0.0-preview.24324.1 - 9.0.0-preview.7.24366.18 - 9.0.0-preview.7.24366.18 + 9.0.0-rc.1.24376.16 + 9.0.0-rc.1.24376.16 - 9.0.100-rc.1.24377.4 + 9.0.100-rc.1.24377.5 1.0.537401 From 8d3f031ac3a8a66993e73e63a0a61fa216f97c4d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 29 Jul 2024 00:08:18 +0000 Subject: [PATCH 321/568] Restore branch-specific files --- eng/common/sdl/NuGet.config | 4 +- eng/common/sdl/execute-all-sdl-tools.ps1 | 4 +- eng/common/sdl/init-sdl.ps1 | 8 + eng/common/sdl/sdl.ps1 | 4 +- .../job/publish-build-assets.yml | 127 +------------ .../post-build/post-build.yml | 174 +----------------- .../templates-official/steps/execute-sdl.yml | 86 --------- .../steps/get-federated-access-token.yml | 45 +---- .../templates/job/publish-build-assets.yml | 123 +------------ .../templates/post-build/post-build.yml | 173 +---------------- eng/common/templates/steps/execute-sdl.yml | 89 --------- .../steps/get-federated-access-token.yml | 45 +---- 12 files changed, 34 insertions(+), 848 deletions(-) delete mode 100644 eng/common/templates-official/steps/execute-sdl.yml delete mode 100644 eng/common/templates/steps/execute-sdl.yml diff --git a/eng/common/sdl/NuGet.config b/eng/common/sdl/NuGet.config index 5bfbb02ef04..3849bdb3cf5 100644 --- a/eng/common/sdl/NuGet.config +++ b/eng/common/sdl/NuGet.config @@ -5,11 +5,11 @@ - + - + diff --git a/eng/common/sdl/execute-all-sdl-tools.ps1 b/eng/common/sdl/execute-all-sdl-tools.ps1 index 81ded5b7f47..4715d75e974 100644 --- a/eng/common/sdl/execute-all-sdl-tools.ps1 +++ b/eng/common/sdl/execute-all-sdl-tools.ps1 @@ -6,6 +6,7 @@ Param( [string] $BranchName=$env:BUILD_SOURCEBRANCH, # Optional: name of branch or version of gdn settings; defaults to master [string] $SourceDirectory=$env:BUILD_SOURCESDIRECTORY, # Required: the directory where source files are located [string] $ArtifactsDirectory = (Join-Path $env:BUILD_ARTIFACTSTAGINGDIRECTORY ('artifacts')), # Required: the directory where build artifacts are located + [string] $AzureDevOpsAccessToken, # Required: access token for dnceng; should be provided via KeyVault # Optional: list of SDL tools to run on source code. See 'configure-sdl-tool.ps1' for tools list # format. @@ -74,7 +75,7 @@ try { } Exec-BlockVerbosely { - & $(Join-Path $PSScriptRoot 'init-sdl.ps1') -GuardianCliLocation $guardianCliLocation -Repository $RepoName -BranchName $BranchName -WorkingDirectory $workingDirectory -GuardianLoggerLevel $GuardianLoggerLevel + & $(Join-Path $PSScriptRoot 'init-sdl.ps1') -GuardianCliLocation $guardianCliLocation -Repository $RepoName -BranchName $BranchName -WorkingDirectory $workingDirectory -AzureDevOpsAccessToken $AzureDevOpsAccessToken -GuardianLoggerLevel $GuardianLoggerLevel } $gdnFolder = Join-Path $workingDirectory '.gdn' @@ -103,6 +104,7 @@ try { -TargetDirectory $targetDirectory ` -GdnFolder $gdnFolder ` -ToolsList $tools ` + -AzureDevOpsAccessToken $AzureDevOpsAccessToken ` -GuardianLoggerLevel $GuardianLoggerLevel ` -CrScanAdditionalRunConfigParams $CrScanAdditionalRunConfigParams ` -PoliCheckAdditionalRunConfigParams $PoliCheckAdditionalRunConfigParams ` diff --git a/eng/common/sdl/init-sdl.ps1 b/eng/common/sdl/init-sdl.ps1 index 588ff8e22fb..3ac1d92b370 100644 --- a/eng/common/sdl/init-sdl.ps1 +++ b/eng/common/sdl/init-sdl.ps1 @@ -3,6 +3,7 @@ Param( [string] $Repository, [string] $BranchName='master', [string] $WorkingDirectory, + [string] $AzureDevOpsAccessToken, [string] $GuardianLoggerLevel='Standard' ) @@ -20,7 +21,14 @@ $ci = $true # Don't display the console progress UI - it's a huge perf hit $ProgressPreference = 'SilentlyContinue' +# Construct basic auth from AzDO access token; construct URI to the repository's gdn folder stored in that repository; construct location of zip file +$encodedPat = [Convert]::ToBase64String([System.Text.Encoding]::ASCII.GetBytes(":$AzureDevOpsAccessToken")) +$escapedRepository = [Uri]::EscapeDataString("/$Repository/$BranchName/.gdn") +$uri = "https://dev.azure.com/dnceng/internal/_apis/git/repositories/sdl-tool-cfg/Items?path=$escapedRepository&versionDescriptor[versionOptions]=0&`$format=zip&api-version=5.0" +$zipFile = "$WorkingDirectory/gdn.zip" + Add-Type -AssemblyName System.IO.Compression.FileSystem +$gdnFolder = (Join-Path $WorkingDirectory '.gdn') try { # if the folder does not exist, we'll do a guardian init and push it to the remote repository diff --git a/eng/common/sdl/sdl.ps1 b/eng/common/sdl/sdl.ps1 index 7fe603fe995..648c5068d7d 100644 --- a/eng/common/sdl/sdl.ps1 +++ b/eng/common/sdl/sdl.ps1 @@ -4,8 +4,6 @@ function Install-Gdn { [Parameter(Mandatory=$true)] [string]$Path, - [string]$Source = "https://pkgs.dev.azure.com/dnceng/_packaging/Guardian1ESPTUpstreamOrgFeed/nuget/v3/index.json", - # If omitted, install the latest version of Guardian, otherwise install that specific version. [string]$Version ) @@ -21,7 +19,7 @@ function Install-Gdn { $ci = $true . $PSScriptRoot\..\tools.ps1 - $argumentList = @("install", "Microsoft.Guardian.Cli.win-x64", "-Source $Source", "-OutputDirectory $Path", "-NonInteractive", "-NoCache") + $argumentList = @("install", "Microsoft.Guardian.Cli", "-Source https://securitytools.pkgs.visualstudio.com/_packaging/Guardian/nuget/v3/index.json", "-OutputDirectory $Path", "-NonInteractive", "-NoCache") if ($Version) { $argumentList += "-Version $Version" diff --git a/eng/common/templates-official/job/publish-build-assets.yml b/eng/common/templates-official/job/publish-build-assets.yml index 6bda0e46b00..d667a70e8de 100644 --- a/eng/common/templates-official/job/publish-build-assets.yml +++ b/eng/common/templates-official/job/publish-build-assets.yml @@ -3,128 +3,5 @@ jobs: parameters: is1ESPipeline: true - dependsOn: ${{ parameters.dependsOn }} - timeoutInMinutes: 150 - - ${{ if eq(parameters.publishAssetsImmediately, 'true') }}: - displayName: Publish Assets - ${{ else }}: - displayName: Publish to Build Asset Registry - - variables: - - template: /eng/common/templates-official/variables/pool-providers.yml - - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - group: Publish-Build-Assets - - group: AzureDevOps-Artifact-Feeds-Pats - - name: runCodesignValidationInjection - value: false - - ${{ if eq(parameters.publishAssetsImmediately, 'true') }}: - - template: /eng/common/templates-official/post-build/common-variables.yml - - pool: - # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) - ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: - name: AzurePipelines-EO - image: 1ESPT-Windows2022 - demands: Cmd - os: windows - # If it's not devdiv, it's dnceng - ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: - name: NetCore1ESPool-Publishing-Internal - image: windows.vs2019.amd64 - os: windows - steps: - - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - task: DownloadBuildArtifacts@0 - displayName: Download artifact - inputs: - artifactName: AssetManifests - downloadPath: '$(Build.StagingDirectory)/Download' - checkDownloadedFiles: true - condition: ${{ parameters.condition }} - continueOnError: ${{ parameters.continueOnError }} - - - task: NuGetAuthenticate@1 - - - task: AzureCLI@2 - displayName: Publish Build Assets - inputs: - azureSubscription: "Darc: Maestro Production" - scriptType: ps - scriptLocation: scriptPath - scriptPath: $(Build.SourcesDirectory)/eng/common/sdk-task.ps1 - arguments: > - -task PublishBuildAssets -restore -msbuildEngine dotnet - /p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests' - /p:MaestroApiEndpoint=https://maestro-prod.westus2.cloudapp.azure.com - /p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }} - /p:OfficialBuildId=$(Build.BuildNumber) - condition: ${{ parameters.condition }} - continueOnError: ${{ parameters.continueOnError }} - - - task: powershell@2 - displayName: Create ReleaseConfigs Artifact - inputs: - targetType: inline - script: | - New-Item -Path "$(Build.StagingDirectory)/ReleaseConfigs" -ItemType Directory -Force - $filePath = "$(Build.StagingDirectory)/ReleaseConfigs/ReleaseConfigs.txt" - Add-Content -Path $filePath -Value $(BARBuildId) - Add-Content -Path $filePath -Value "$(DefaultChannels)" - Add-Content -Path $filePath -Value $(IsStableBuild) - - - task: 1ES.PublishBuildArtifacts@1 - displayName: Publish ReleaseConfigs Artifact - inputs: - PathtoPublish: '$(Build.StagingDirectory)/ReleaseConfigs' - PublishLocation: Container - ArtifactName: ReleaseConfigs - - - task: powershell@2 - displayName: Check if SymbolPublishingExclusionsFile.txt exists - inputs: - targetType: inline - script: | - $symbolExclusionfile = "$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt" - if(Test-Path -Path $symbolExclusionfile) - { - Write-Host "SymbolExclusionFile exists" - Write-Host "##vso[task.setvariable variable=SymbolExclusionFile]true" - } - else{ - Write-Host "Symbols Exclusion file does not exists" - Write-Host "##vso[task.setvariable variable=SymbolExclusionFile]false" - } - - - task: 1ES.PublishBuildArtifacts@1 - displayName: Publish SymbolPublishingExclusionsFile Artifact - condition: eq(variables['SymbolExclusionFile'], 'true') - inputs: - PathtoPublish: '$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' - PublishLocation: Container - ArtifactName: ReleaseConfigs - - - ${{ if eq(parameters.publishAssetsImmediately, 'true') }}: - - template: /eng/common/templates-official/post-build/setup-maestro-vars.yml - parameters: - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - - - task: AzureCLI@2 - displayName: Publish Using Darc - inputs: - azureSubscription: "Darc: Maestro Production" - scriptType: ps - scriptLocation: scriptPath - scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 - arguments: -BuildId $(BARBuildId) - -PublishingInfraVersion 3 - -AzdoToken '$(System.AccessToken)' - -WaitPublishingFinish true - -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' - -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' - - - ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}: - - template: /eng/common/templates-official/steps/publish-logs.yml - parameters: - JobLabel: 'Publish_Artifacts_Logs' + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/eng/common/templates-official/post-build/post-build.yml b/eng/common/templates-official/post-build/post-build.yml index 2b8b3b3b9c5..2364c0fd4a5 100644 --- a/eng/common/templates-official/post-build/post-build.yml +++ b/eng/common/templates-official/post-build/post-build.yml @@ -4,175 +4,5 @@ stages: # Specifies whether to use 1ES is1ESPipeline: true - steps: - - template: setup-maestro-vars.yml - parameters: - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - - - task: DownloadBuildArtifacts@0 - displayName: Download Package Artifacts - inputs: - buildType: specific - buildVersionToDownload: specific - project: $(AzDOProjectName) - pipeline: $(AzDOPipelineId) - buildId: $(AzDOBuildId) - artifactName: PackageArtifacts - checkDownloadedFiles: true - - - task: PowerShell@2 - displayName: Validate - inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/nuget-validation.ps1 - arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ - -ToolDestinationPath $(Agent.BuildDirectory)/Extract/ - - - job: - displayName: Signing Validation - condition: and( eq( ${{ parameters.enableSigningValidation }}, 'true'), ne( variables['PostBuildSign'], 'true')) - pool: - # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) - ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: - name: AzurePipelines-EO - image: 1ESPT-Windows2022 - demands: Cmd - os: windows - # If it's not devdiv, it's dnceng - ${{ else }}: - name: $(DncEngInternalBuildPool) - image: 1es-windows-2022 - os: windows - steps: - - template: setup-maestro-vars.yml - parameters: - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - - - task: DownloadBuildArtifacts@0 - displayName: Download Package Artifacts - inputs: - buildType: specific - buildVersionToDownload: specific - project: $(AzDOProjectName) - pipeline: $(AzDOPipelineId) - buildId: $(AzDOBuildId) - artifactName: PackageArtifacts - checkDownloadedFiles: true - itemPattern: | - ** - !**/Microsoft.SourceBuild.Intermediate.*.nupkg - - # 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@1 - displayName: 'Authenticate to AzDO Feeds' - - # Signing validation will optionally work with the buildmanifest file which is downloaded from - # Azure DevOps above. - - task: PowerShell@2 - displayName: Validate - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task SigningValidation -restore -msbuildEngine vs - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts' - /p:SignCheckExclusionsFile='$(Build.SourcesDirectory)/eng/SignCheckExclusionsFile.txt' - ${{ parameters.signingValidationAdditionalParameters }} - - - template: ../steps/publish-logs.yml - parameters: - StageLabel: 'Validation' - JobLabel: 'Signing' - BinlogToolVersion: $(BinlogToolVersion) - - - job: - displayName: SourceLink Validation - condition: eq( ${{ parameters.enableSourceLinkValidation }}, 'true') - pool: - # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) - ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: - name: AzurePipelines-EO - image: 1ESPT-Windows2022 - demands: Cmd - os: windows - # If it's not devdiv, it's dnceng - ${{ else }}: - name: $(DncEngInternalBuildPool) - image: 1es-windows-2022 - os: windows - steps: - - template: setup-maestro-vars.yml - parameters: - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - buildType: specific - buildVersionToDownload: specific - project: $(AzDOProjectName) - pipeline: $(AzDOPipelineId) - buildId: $(AzDOBuildId) - artifactName: BlobArtifacts - checkDownloadedFiles: true - - - task: PowerShell@2 - displayName: Validate - inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/sourcelink-validation.ps1 - arguments: -InputPath $(Build.ArtifactStagingDirectory)/BlobArtifacts/ - -ExtractPath $(Agent.BuildDirectory)/Extract/ - -GHRepoName $(Build.Repository.Name) - -GHCommit $(Build.SourceVersion) - -SourcelinkCliVersion $(SourceLinkCLIVersion) - continueOnError: true - -- ${{ if ne(parameters.publishAssetsImmediately, 'true') }}: - - stage: publish_using_darc - ${{ if or(eq(parameters.enableNugetValidation, 'true'), eq(parameters.enableSigningValidation, 'true'), eq(parameters.enableSourceLinkValidation, 'true'), eq(parameters.SDLValidationParameters.enable, 'true')) }}: - dependsOn: ${{ parameters.publishDependsOn }} - ${{ else }}: - dependsOn: ${{ parameters.validateDependsOn }} - displayName: Publish using Darc - variables: - - template: common-variables.yml - - template: /eng/common/templates-official/variables/pool-providers.yml - jobs: - - job: - displayName: Publish Using Darc - timeoutInMinutes: 120 - pool: - # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) - ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: - name: AzurePipelines-EO - image: 1ESPT-Windows2022 - demands: Cmd - os: windows - # If it's not devdiv, it's dnceng - ${{ else }}: - name: NetCore1ESPool-Publishing-Internal - image: windows.vs2019.amd64 - os: windows - steps: - - template: setup-maestro-vars.yml - parameters: - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - - - task: NuGetAuthenticate@1 - - - task: AzureCLI@2 - displayName: Publish Using Darc - inputs: - azureSubscription: "Darc: Maestro Production" - scriptType: ps - scriptLocation: scriptPath - scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 - arguments: -BuildId $(BARBuildId) - -PublishingInfraVersion ${{ parameters.publishingInfraVersion }} - -AzdoToken '$(System.AccessToken)' - -WaitPublishingFinish true - -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' - -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/eng/common/templates-official/steps/execute-sdl.yml b/eng/common/templates-official/steps/execute-sdl.yml deleted file mode 100644 index 301d5c591eb..00000000000 --- a/eng/common/templates-official/steps/execute-sdl.yml +++ /dev/null @@ -1,86 +0,0 @@ -parameters: - overrideGuardianVersion: '' - executeAllSdlToolsScript: '' - overrideParameters: '' - additionalParameters: '' - publishGuardianDirectoryToPipeline: false - sdlContinueOnError: false - condition: '' - -steps: -- task: NuGetAuthenticate@1 - -- task: NuGetToolInstaller@1 - displayName: 'Install NuGet.exe' - -- ${{ if ne(parameters.overrideGuardianVersion, '') }}: - - pwsh: | - Set-Location -Path $(Build.SourcesDirectory)\eng\common\sdl - . .\sdl.ps1 - $guardianCliLocation = Install-Gdn -Path $(Build.SourcesDirectory)\.artifacts -Version ${{ parameters.overrideGuardianVersion }} - Write-Host "##vso[task.setvariable variable=GuardianCliLocation]$guardianCliLocation" - displayName: Install Guardian (Overridden) - -- ${{ if eq(parameters.overrideGuardianVersion, '') }}: - - pwsh: | - Set-Location -Path $(Build.SourcesDirectory)\eng\common\sdl - . .\sdl.ps1 - $guardianCliLocation = Install-Gdn -Path $(Build.SourcesDirectory)\.artifacts - Write-Host "##vso[task.setvariable variable=GuardianCliLocation]$guardianCliLocation" - displayName: Install Guardian - -- ${{ if ne(parameters.overrideParameters, '') }}: - - powershell: ${{ parameters.executeAllSdlToolsScript }} ${{ parameters.overrideParameters }} - displayName: Execute SDL (Overridden) - continueOnError: ${{ parameters.sdlContinueOnError }} - condition: ${{ parameters.condition }} - -- ${{ if eq(parameters.overrideParameters, '') }}: - - powershell: ${{ parameters.executeAllSdlToolsScript }} - -GuardianCliLocation $(GuardianCliLocation) - -NugetPackageDirectory $(Build.SourcesDirectory)\.packages - -AzureDevOpsAccessToken $(dn-bot-dotnet-build-rw-code-rw) - ${{ parameters.additionalParameters }} - displayName: Execute SDL - continueOnError: ${{ parameters.sdlContinueOnError }} - condition: ${{ parameters.condition }} - -- ${{ if ne(parameters.publishGuardianDirectoryToPipeline, 'false') }}: - # We want to publish the Guardian results and configuration for easy diagnosis. However, the - # '.gdn' dir is a mix of configuration, results, extracted dependencies, and Guardian default - # tooling files. Some of these files are large and aren't useful during an investigation, so - # exclude them by simply deleting them before publishing. (As of writing, there is no documented - # way to selectively exclude a dir from the pipeline artifact publish task.) - - task: DeleteFiles@1 - displayName: Delete Guardian dependencies to avoid uploading - inputs: - SourceFolder: $(Agent.BuildDirectory)/.gdn - Contents: | - c - i - condition: succeededOrFailed() - - - publish: $(Agent.BuildDirectory)/.gdn - artifact: GuardianConfiguration - displayName: Publish GuardianConfiguration - condition: succeededOrFailed() - - # Publish the SARIF files in a container named CodeAnalysisLogs to enable integration - # with the "SARIF SAST Scans Tab" Azure DevOps extension - - task: CopyFiles@2 - displayName: Copy SARIF files - inputs: - flattenFolders: true - sourceFolder: $(Agent.BuildDirectory)/.gdn/rc/ - contents: '**/*.sarif' - targetFolder: $(Build.SourcesDirectory)/CodeAnalysisLogs - condition: succeededOrFailed() - - # Use PublishBuildArtifacts because the SARIF extension only checks this case - # see microsoft/sarif-azuredevops-extension#4 - - task: PublishBuildArtifacts@1 - displayName: Publish SARIF files to CodeAnalysisLogs container - inputs: - pathToPublish: $(Build.SourcesDirectory)/CodeAnalysisLogs - artifactName: CodeAnalysisLogs - condition: succeededOrFailed() \ No newline at end of file diff --git a/eng/common/templates-official/steps/get-federated-access-token.yml b/eng/common/templates-official/steps/get-federated-access-token.yml index 55e33bd38f7..c8dcf6b8139 100644 --- a/eng/common/templates-official/steps/get-federated-access-token.yml +++ b/eng/common/templates-official/steps/get-federated-access-token.yml @@ -1,40 +1,7 @@ -parameters: -- name: federatedServiceConnection - type: string -- name: outputVariableName - type: string -- name: stepName - type: string - default: 'getFederatedAccessToken' -- name: condition - type: string - default: '' -# Resource to get a token for. Common values include: -# - '499b84ac-1321-427f-aa17-267ca6975798' for Azure DevOps -# - 'https://storage.azure.com/' for storage -# Defaults to Azure DevOps -- name: resource - type: string - default: '499b84ac-1321-427f-aa17-267ca6975798' -- name: isStepOutputVariable - type: boolean - default: false - steps: -- task: AzureCLI@2 - displayName: 'Getting federated access token for feeds' - name: ${{ parameters.stepName }} - ${{ if ne(parameters.condition, '') }}: - condition: ${{ parameters.condition }} - inputs: - azureSubscription: ${{ parameters.federatedServiceConnection }} - scriptType: 'pscore' - scriptLocation: 'inlineScript' - inlineScript: | - $accessToken = az account get-access-token --query accessToken --resource ${{ parameters.resource }} --output tsv - if ($LASTEXITCODE -ne 0) { - Write-Error "Failed to get access token for resource '${{ parameters.resource }}'" - exit 1 - } - Write-Host "Setting '${{ parameters.outputVariableName }}' with the access token value" - Write-Host "##vso[task.setvariable variable=${{ parameters.outputVariableName }};issecret=true;isOutput=${{ parameters.isStepOutputVariable }}]$accessToken" \ No newline at end of file +- template: /eng/common/core-templates/steps/get-federated-access-token.yml + parameters: + is1ESPipeline: true + + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} \ No newline at end of file diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml index c95a5e4023d..ab2edec2adb 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -3,124 +3,5 @@ jobs: parameters: is1ESPipeline: false - dependsOn: ${{ parameters.dependsOn }} - timeoutInMinutes: 150 - - ${{ if eq(parameters.publishAssetsImmediately, 'true') }}: - displayName: Publish Assets - ${{ else }}: - displayName: Publish to Build Asset Registry - - variables: - - template: /eng/common/templates/variables/pool-providers.yml - - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - group: Publish-Build-Assets - - group: AzureDevOps-Artifact-Feeds-Pats - - name: runCodesignValidationInjection - value: false - - ${{ if eq(parameters.publishAssetsImmediately, 'true') }}: - - template: /eng/common/templates/post-build/common-variables.yml - - pool: - # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) - ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: - name: VSEngSS-MicroBuild2022-1ES - demands: Cmd - # If it's not devdiv, it's dnceng - ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: - name: NetCore1ESPool-Publishing-Internal - demands: ImageOverride -equals windows.vs2019.amd64 - - steps: - - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - task: DownloadBuildArtifacts@0 - displayName: Download artifact - inputs: - artifactName: AssetManifests - downloadPath: '$(Build.StagingDirectory)/Download' - checkDownloadedFiles: true - condition: ${{ parameters.condition }} - continueOnError: ${{ parameters.continueOnError }} - - - task: NuGetAuthenticate@1 - - - task: AzureCLI@2 - displayName: Publish Build Assets - inputs: - azureSubscription: "Darc: Maestro Production" - scriptType: ps - scriptLocation: scriptPath - scriptPath: $(Build.SourcesDirectory)/eng/common/sdk-task.ps1 - arguments: > - -task PublishBuildAssets -restore -msbuildEngine dotnet - /p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests' - /p:MaestroApiEndpoint=https://maestro.dot.net - /p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }} - /p:OfficialBuildId=$(Build.BuildNumber) - condition: ${{ parameters.condition }} - continueOnError: ${{ parameters.continueOnError }} - - - task: powershell@2 - displayName: Create ReleaseConfigs Artifact - inputs: - targetType: inline - script: | - Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value $(BARBuildId) - Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value "$(DefaultChannels)" - Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value $(IsStableBuild) - - - task: PublishBuildArtifacts@1 - displayName: Publish ReleaseConfigs Artifact - inputs: - PathtoPublish: '$(Build.StagingDirectory)/ReleaseConfigs.txt' - PublishLocation: Container - ArtifactName: ReleaseConfigs - - - task: powershell@2 - displayName: Check if SymbolPublishingExclusionsFile.txt exists - inputs: - targetType: inline - script: | - $symbolExclusionfile = "$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt" - if(Test-Path -Path $symbolExclusionfile) - { - Write-Host "SymbolExclusionFile exists" - Write-Host "##vso[task.setvariable variable=SymbolExclusionFile]true" - } - else{ - Write-Host "Symbols Exclusion file does not exists" - Write-Host "##vso[task.setvariable variable=SymbolExclusionFile]false" - } - - - task: PublishBuildArtifacts@1 - displayName: Publish SymbolPublishingExclusionsFile Artifact - condition: eq(variables['SymbolExclusionFile'], 'true') - inputs: - PathtoPublish: '$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' - PublishLocation: Container - ArtifactName: ReleaseConfigs - - - ${{ if eq(parameters.publishAssetsImmediately, 'true') }}: - - template: /eng/common/templates/post-build/setup-maestro-vars.yml - parameters: - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - - - task: AzureCLI@2 - displayName: Publish Using Darc - inputs: - azureSubscription: "Darc: Maestro Production" - scriptType: ps - scriptLocation: scriptPath - scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 - arguments: -BuildId $(BARBuildId) - -PublishingInfraVersion 3 - -AzdoToken '$(System.AccessToken)' - -WaitPublishingFinish true - -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' - -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' - - - ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}: - - template: /eng/common/templates/steps/publish-logs.yml - parameters: - JobLabel: 'Publish_Artifacts_Logs' + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index 4e7282eedbd..53ede714bdd 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -4,174 +4,5 @@ stages: # Specifies whether to use 1ES is1ESPipeline: false - steps: - - template: setup-maestro-vars.yml - parameters: - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - - - task: DownloadBuildArtifacts@0 - displayName: Download Package Artifacts - inputs: - buildType: specific - buildVersionToDownload: specific - project: $(AzDOProjectName) - pipeline: $(AzDOPipelineId) - buildId: $(AzDOBuildId) - artifactName: PackageArtifacts - checkDownloadedFiles: true - - - task: PowerShell@2 - displayName: Validate - inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/nuget-validation.ps1 - arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ - -ToolDestinationPath $(Agent.BuildDirectory)/Extract/ - - - job: - displayName: Signing Validation - condition: and( eq( ${{ parameters.enableSigningValidation }}, 'true'), ne( variables['PostBuildSign'], 'true')) - pool: - # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) - ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: - name: VSEngSS-MicroBuild2022-1ES - demands: Cmd - # If it's not devdiv, it's dnceng - ${{ else }}: - name: $(DncEngInternalBuildPool) - demands: ImageOverride -equals windows.vs2019.amd64 - steps: - - template: setup-maestro-vars.yml - parameters: - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - - - task: DownloadBuildArtifacts@0 - displayName: Download Package Artifacts - inputs: - buildType: specific - buildVersionToDownload: specific - project: $(AzDOProjectName) - pipeline: $(AzDOPipelineId) - buildId: $(AzDOBuildId) - artifactName: PackageArtifacts - checkDownloadedFiles: true - itemPattern: | - ** - !**/Microsoft.SourceBuild.Intermediate.*.nupkg - - # 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@1 - displayName: 'Authenticate to AzDO Feeds' - - # Signing validation will optionally work with the buildmanifest file which is downloaded from - # Azure DevOps above. - - task: PowerShell@2 - displayName: Validate - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task SigningValidation -restore -msbuildEngine vs - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts' - /p:SignCheckExclusionsFile='$(Build.SourcesDirectory)/eng/SignCheckExclusionsFile.txt' - ${{ parameters.signingValidationAdditionalParameters }} - - - template: ../steps/publish-logs.yml - parameters: - StageLabel: 'Validation' - JobLabel: 'Signing' - - - job: - displayName: SourceLink Validation - condition: eq( ${{ parameters.enableSourceLinkValidation }}, 'true') - pool: - # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) - ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: - name: VSEngSS-MicroBuild2022-1ES - demands: Cmd - # If it's not devdiv, it's dnceng - ${{ else }}: - name: $(DncEngInternalBuildPool) - demands: ImageOverride -equals windows.vs2019.amd64 - steps: - - template: setup-maestro-vars.yml - parameters: - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - buildType: specific - buildVersionToDownload: specific - project: $(AzDOProjectName) - pipeline: $(AzDOPipelineId) - buildId: $(AzDOBuildId) - artifactName: BlobArtifacts - checkDownloadedFiles: true - - - task: PowerShell@2 - displayName: Validate - inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/sourcelink-validation.ps1 - arguments: -InputPath $(Build.ArtifactStagingDirectory)/BlobArtifacts/ - -ExtractPath $(Agent.BuildDirectory)/Extract/ - -GHRepoName $(Build.Repository.Name) - -GHCommit $(Build.SourceVersion) - -SourcelinkCliVersion $(SourceLinkCLIVersion) - continueOnError: true - - - template: /eng/common/templates/job/execute-sdl.yml - parameters: - enable: ${{ parameters.SDLValidationParameters.enable }} - publishGuardianDirectoryToPipeline: ${{ parameters.SDLValidationParameters.publishGdn }} - additionalParameters: ${{ parameters.SDLValidationParameters.params }} - continueOnError: ${{ parameters.SDLValidationParameters.continueOnError }} - artifactNames: ${{ parameters.SDLValidationParameters.artifactNames }} - downloadArtifacts: ${{ parameters.SDLValidationParameters.downloadArtifacts }} - -- ${{ if ne(parameters.publishAssetsImmediately, 'true') }}: - - stage: publish_using_darc - ${{ if or(eq(parameters.enableNugetValidation, 'true'), eq(parameters.enableSigningValidation, 'true'), eq(parameters.enableSourceLinkValidation, 'true'), eq(parameters.SDLValidationParameters.enable, 'true')) }}: - dependsOn: ${{ parameters.publishDependsOn }} - ${{ else }}: - dependsOn: ${{ parameters.validateDependsOn }} - displayName: Publish using Darc - variables: - - template: common-variables.yml - - template: /eng/common/templates/variables/pool-providers.yml - jobs: - - job: - displayName: Publish Using Darc - timeoutInMinutes: 120 - pool: - # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) - ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: - name: VSEngSS-MicroBuild2022-1ES - demands: Cmd - # If it's not devdiv, it's dnceng - ${{ else }}: - name: NetCore1ESPool-Publishing-Internal - demands: ImageOverride -equals windows.vs2019.amd64 - steps: - - template: setup-maestro-vars.yml - parameters: - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - - - task: NuGetAuthenticate@1 - - - task: AzureCLI@2 - displayName: Publish Using Darc - inputs: - azureSubscription: "Darc: Maestro Production" - scriptType: ps - scriptLocation: scriptPath - scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 - arguments: -BuildId $(BARBuildId) - -PublishingInfraVersion ${{ parameters.publishingInfraVersion }} - -AzdoToken '$(System.AccessToken)' - -WaitPublishingFinish true - -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' - -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} \ No newline at end of file diff --git a/eng/common/templates/steps/execute-sdl.yml b/eng/common/templates/steps/execute-sdl.yml deleted file mode 100644 index fe0ebf8c904..00000000000 --- a/eng/common/templates/steps/execute-sdl.yml +++ /dev/null @@ -1,89 +0,0 @@ -parameters: - overrideGuardianVersion: '' - executeAllSdlToolsScript: '' - overrideParameters: '' - additionalParameters: '' - publishGuardianDirectoryToPipeline: false - sdlContinueOnError: false - condition: '' - -steps: -- task: NuGetAuthenticate@1 - -- task: NuGetToolInstaller@1 - displayName: 'Install NuGet.exe' - -- ${{ if ne(parameters.overrideGuardianVersion, '') }}: - - pwsh: | - Set-Location -Path $(Build.SourcesDirectory)\eng\common\sdl - . .\sdl.ps1 - $guardianCliLocation = Install-Gdn -Path $(Build.SourcesDirectory)\.artifacts -Version ${{ parameters.overrideGuardianVersion }} - Write-Host "##vso[task.setvariable variable=GuardianCliLocation]$guardianCliLocation" - displayName: Install Guardian (Overridden) - -- ${{ if eq(parameters.overrideGuardianVersion, '') }}: - - pwsh: | - Set-Location -Path $(Build.SourcesDirectory)\eng\common\sdl - . .\sdl.ps1 - $guardianCliLocation = Install-Gdn -Path $(Build.SourcesDirectory)\.artifacts - Write-Host "##vso[task.setvariable variable=GuardianCliLocation]$guardianCliLocation" - displayName: Install Guardian - -- ${{ if ne(parameters.overrideParameters, '') }}: - - powershell: ${{ parameters.executeAllSdlToolsScript }} ${{ parameters.overrideParameters }} - displayName: Execute SDL (Overridden) - continueOnError: ${{ parameters.sdlContinueOnError }} - condition: ${{ parameters.condition }} - env: - GUARDIAN_DEFAULT_PACKAGE_SOURCE_SECRET: $(System.AccessToken) - -- ${{ if eq(parameters.overrideParameters, '') }}: - - powershell: ${{ parameters.executeAllSdlToolsScript }} - -GuardianCliLocation $(GuardianCliLocation) - -NugetPackageDirectory $(Build.SourcesDirectory)\.packages - ${{ parameters.additionalParameters }} - displayName: Execute SDL - continueOnError: ${{ parameters.sdlContinueOnError }} - condition: ${{ parameters.condition }} - env: - GUARDIAN_DEFAULT_PACKAGE_SOURCE_SECRET: $(System.AccessToken) - -- ${{ if ne(parameters.publishGuardianDirectoryToPipeline, 'false') }}: - # We want to publish the Guardian results and configuration for easy diagnosis. However, the - # '.gdn' dir is a mix of configuration, results, extracted dependencies, and Guardian default - # tooling files. Some of these files are large and aren't useful during an investigation, so - # exclude them by simply deleting them before publishing. (As of writing, there is no documented - # way to selectively exclude a dir from the pipeline artifact publish task.) - - task: DeleteFiles@1 - displayName: Delete Guardian dependencies to avoid uploading - inputs: - SourceFolder: $(Agent.BuildDirectory)/.gdn - Contents: | - c - i - condition: succeededOrFailed() - - - publish: $(Agent.BuildDirectory)/.gdn - artifact: GuardianConfiguration - displayName: Publish GuardianConfiguration - condition: succeededOrFailed() - - # Publish the SARIF files in a container named CodeAnalysisLogs to enable integration - # with the "SARIF SAST Scans Tab" Azure DevOps extension - - task: CopyFiles@2 - displayName: Copy SARIF files - inputs: - flattenFolders: true - sourceFolder: $(Agent.BuildDirectory)/.gdn/rc/ - contents: '**/*.sarif' - targetFolder: $(Build.SourcesDirectory)/CodeAnalysisLogs - condition: succeededOrFailed() - - # Use PublishBuildArtifacts because the SARIF extension only checks this case - # see microsoft/sarif-azuredevops-extension#4 - - task: PublishBuildArtifacts@1 - displayName: Publish SARIF files to CodeAnalysisLogs container - inputs: - pathToPublish: $(Build.SourcesDirectory)/CodeAnalysisLogs - artifactName: CodeAnalysisLogs - condition: succeededOrFailed() \ No newline at end of file diff --git a/eng/common/templates/steps/get-federated-access-token.yml b/eng/common/templates/steps/get-federated-access-token.yml index 55e33bd38f7..31e151d9d9e 100644 --- a/eng/common/templates/steps/get-federated-access-token.yml +++ b/eng/common/templates/steps/get-federated-access-token.yml @@ -1,40 +1,7 @@ -parameters: -- name: federatedServiceConnection - type: string -- name: outputVariableName - type: string -- name: stepName - type: string - default: 'getFederatedAccessToken' -- name: condition - type: string - default: '' -# Resource to get a token for. Common values include: -# - '499b84ac-1321-427f-aa17-267ca6975798' for Azure DevOps -# - 'https://storage.azure.com/' for storage -# Defaults to Azure DevOps -- name: resource - type: string - default: '499b84ac-1321-427f-aa17-267ca6975798' -- name: isStepOutputVariable - type: boolean - default: false - steps: -- task: AzureCLI@2 - displayName: 'Getting federated access token for feeds' - name: ${{ parameters.stepName }} - ${{ if ne(parameters.condition, '') }}: - condition: ${{ parameters.condition }} - inputs: - azureSubscription: ${{ parameters.federatedServiceConnection }} - scriptType: 'pscore' - scriptLocation: 'inlineScript' - inlineScript: | - $accessToken = az account get-access-token --query accessToken --resource ${{ parameters.resource }} --output tsv - if ($LASTEXITCODE -ne 0) { - Write-Error "Failed to get access token for resource '${{ parameters.resource }}'" - exit 1 - } - Write-Host "Setting '${{ parameters.outputVariableName }}' with the access token value" - Write-Host "##vso[task.setvariable variable=${{ parameters.outputVariableName }};issecret=true;isOutput=${{ parameters.isStepOutputVariable }}]$accessToken" \ No newline at end of file +- template: /eng/common/core-templates/steps/get-federated-access-token.yml + parameters: + is1ESPipeline: false + + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} \ No newline at end of file From ca734b57342097c404edf208b0459585f5bfe0c3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 29 Jul 2024 14:33:05 +0000 Subject: [PATCH 322/568] Update dependencies from https://github.com/dotnet/sdk build 20240728.3 (#7051) [feature/9.x] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NETCore.App.Runtime.win-x64: from 9.0.0-rc.1.24376.16 to 9.0.0-rc.1.24377.4 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) - VS.Redist.Common.NetCore.SharedFramework.x64.9.0: from 9.0.0-rc.1.24376.16 to 9.0.0-rc.1.24377.4 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d8d33e6ba4d..31f831a9b58 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -46,21 +46,21 @@ https://github.com/dotnet/diagnostics ae44de5295e6337c9f7adc20890a19c3a21a7545 - + https://github.com/dotnet/runtime - 827c83497bf4eb9816de2c223ea5c054e19954af + 3471de7ffda7105f395a25a57094097a7cc0dc88 https://github.com/dotnet/aspnetcore 25db9495d1c3a84667f62fe62d9b7c0c6db5dcb9 - + https://github.com/dotnet/sdk - 1b87a11061f4447cf0437aa7193df545c749f352 + e028762ceb5ccaa05a8c93c29ce5bbcae926533a - + https://github.com/dotnet/runtime - 827c83497bf4eb9816de2c223ea5c054e19954af + 3471de7ffda7105f395a25a57094097a7cc0dc88 diff --git a/eng/Versions.props b/eng/Versions.props index cd3f355fbb6..bb24b2192c7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -62,10 +62,10 @@ 9.0.0-preview.24324.1 - 9.0.0-rc.1.24376.16 - 9.0.0-rc.1.24376.16 + 9.0.0-rc.1.24377.4 + 9.0.0-rc.1.24377.4 - 9.0.100-rc.1.24377.5 + 9.0.100-rc.1.24378.3 1.0.537401 From 75116a43118934e5e58c822cb876fac4b607f4fb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 29 Jul 2024 10:46:05 -0700 Subject: [PATCH 323/568] [feature/9.x] Update dependencies from dotnet/roslyn-analyzers (#7047) * Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20240728.1 Microsoft.CodeAnalysis.NetAnalyzers From Version 9.0.0-preview.24324.1 -> To Version 9.0.0-preview.24378.1 * Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20240728.1 Microsoft.CodeAnalysis.NetAnalyzers From Version 9.0.0-preview.24324.1 -> To Version 9.0.0-preview.24378.1 --------- Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 31f831a9b58..99d1bffdb02 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -18,9 +18,9 @@ - + https://github.com/dotnet/roslyn-analyzers - 43709af7570da7140fb3e9a5237f55ffb24677e7 + 81d9b5d58e3d384ed4a91b75f4a1ece6352e76d9 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index bb24b2192c7..9704b585b2b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -60,7 +60,7 @@ 8.0.0-preview.24374.1 8.0.0-preview.24374.1 - 9.0.0-preview.24324.1 + 9.0.0-preview.24378.1 9.0.0-rc.1.24377.4 9.0.0-rc.1.24377.4 From f0c195edfe71bbcff01e2eca921186a644dd19ff Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 29 Jul 2024 15:09:15 -0700 Subject: [PATCH 324/568] [feature/9.x] Update dependencies from dotnet/diagnostics (#7041) * Update dependencies from https://github.com/dotnet/diagnostics build 20240725.1 Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe , Microsoft.FileFormats From Version 8.0.0-preview.24374.1 -> To Version 8.0.0-preview.24375.1 * Update dependencies from https://github.com/dotnet/diagnostics build 20240726.1 Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe , Microsoft.FileFormats From Version 8.0.0-preview.24374.1 -> To Version 8.0.0-preview.24376.1 * Update dependencies from https://github.com/dotnet/diagnostics build 20240726.1 Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe , Microsoft.FileFormats From Version 8.0.0-preview.24374.1 -> To Version 8.0.0-preview.24376.1 * Update dependencies from https://github.com/dotnet/diagnostics build 20240726.1 Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe , Microsoft.FileFormats From Version 8.0.0-preview.24374.1 -> To Version 8.0.0-preview.24376.1 --------- Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 99d1bffdb02..d1329aa98c3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore 25db9495d1c3a84667f62fe62d9b7c0c6db5dcb9 - + https://github.com/dotnet/diagnostics - ae44de5295e6337c9f7adc20890a19c3a21a7545 + 1f8c2213b61e90ea960b33e5d7fb7a9a88c82296 - + https://github.com/dotnet/diagnostics - ae44de5295e6337c9f7adc20890a19c3a21a7545 + 1f8c2213b61e90ea960b33e5d7fb7a9a88c82296 https://github.com/dotnet/command-line-api @@ -42,9 +42,9 @@ https://github.com/dotnet/arcade 3e18bd4f62388b829d0b9dcd1ee131431674aa5f - + https://github.com/dotnet/diagnostics - ae44de5295e6337c9f7adc20890a19c3a21a7545 + 1f8c2213b61e90ea960b33e5d7fb7a9a88c82296 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 9704b585b2b..71c4b264d34 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24324.3 - 8.0.0-preview.24374.1 - 8.0.0-preview.24374.1 + 8.0.0-preview.24376.1 + 8.0.0-preview.24376.1 9.0.0-preview.24378.1 @@ -67,7 +67,7 @@ 9.0.100-rc.1.24378.3 - 1.0.537401 + 1.0.537601 $(MicrosoftNETCoreApp31Version) From 9998de1cce59ff88a507af0b0b5934b40362ebec Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 30 Jul 2024 14:22:10 +0000 Subject: [PATCH 325/568] Update dependencies from https://github.com/dotnet/diagnostics build 20240729.1 (#7057) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d1329aa98c3..89c26e2e3bf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore 25db9495d1c3a84667f62fe62d9b7c0c6db5dcb9 - + https://github.com/dotnet/diagnostics - 1f8c2213b61e90ea960b33e5d7fb7a9a88c82296 + 2426e6132aef4add69871e8242392dfab519c211 - + https://github.com/dotnet/diagnostics - 1f8c2213b61e90ea960b33e5d7fb7a9a88c82296 + 2426e6132aef4add69871e8242392dfab519c211 https://github.com/dotnet/command-line-api @@ -42,9 +42,9 @@ https://github.com/dotnet/arcade 3e18bd4f62388b829d0b9dcd1ee131431674aa5f - + https://github.com/dotnet/diagnostics - 1f8c2213b61e90ea960b33e5d7fb7a9a88c82296 + 2426e6132aef4add69871e8242392dfab519c211 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 71c4b264d34..9f4ca2f8b34 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24324.3 - 8.0.0-preview.24376.1 - 8.0.0-preview.24376.1 + 8.0.0-preview.24379.1 + 8.0.0-preview.24379.1 9.0.0-preview.24378.1 @@ -67,7 +67,7 @@ 9.0.100-rc.1.24378.3 - 1.0.537601 + 1.0.537901 $(MicrosoftNETCoreApp31Version) From ad29c62060d926efbb7ed2e5aa1818cb424c2782 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 30 Jul 2024 14:35:42 +0000 Subject: [PATCH 326/568] Update dependencies from https://github.com/dotnet/sdk build 20240730.1 (#7059) [feature/9.x] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Runtime.win-x64: from 9.0.0-rc.1.24376.4 to 9.0.0-rc.1.24379.7 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) - Microsoft.NETCore.App.Runtime.win-x64: from 9.0.0-rc.1.24377.4 to 9.0.0-rc.1.24378.5 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) - VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0: from 9.0.0-rc.1.24376.4 to 9.0.0-rc.1.24379.7 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) - VS.Redist.Common.NetCore.SharedFramework.x64.9.0: from 9.0.0-rc.1.24377.4 to 9.0.0-rc.1.24378.5 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 89c26e2e3bf..6697d2733a1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/aspnetcore - 25db9495d1c3a84667f62fe62d9b7c0c6db5dcb9 + 27f2a011a4211118552dfb8f38d36e8629267d2b https://github.com/dotnet/diagnostics @@ -46,21 +46,21 @@ https://github.com/dotnet/diagnostics 2426e6132aef4add69871e8242392dfab519c211 - + https://github.com/dotnet/runtime - 3471de7ffda7105f395a25a57094097a7cc0dc88 + 0912e94a6c81f4743946831137ba6c3ec3f1a179 - + https://github.com/dotnet/aspnetcore - 25db9495d1c3a84667f62fe62d9b7c0c6db5dcb9 + 27f2a011a4211118552dfb8f38d36e8629267d2b - + https://github.com/dotnet/sdk - e028762ceb5ccaa05a8c93c29ce5bbcae926533a + 328820c7966e9fa45c519548984a66c25297016c - + https://github.com/dotnet/runtime - 3471de7ffda7105f395a25a57094097a7cc0dc88 + 0912e94a6c81f4743946831137ba6c3ec3f1a179 diff --git a/eng/Versions.props b/eng/Versions.props index 9f4ca2f8b34..c166994653d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,8 +52,8 @@ 9.0.0-beta.24375.3 9.0.0-beta.24375.3 - 9.0.0-rc.1.24376.4 - 9.0.0-rc.1.24376.4 + 9.0.0-rc.1.24379.7 + 9.0.0-rc.1.24379.7 2.0.0-beta4.24324.3 @@ -62,10 +62,10 @@ 9.0.0-preview.24378.1 - 9.0.0-rc.1.24377.4 - 9.0.0-rc.1.24377.4 + 9.0.0-rc.1.24378.5 + 9.0.0-rc.1.24378.5 - 9.0.100-rc.1.24378.3 + 9.0.100-rc.1.24380.1 1.0.537901 From 047e4004e10badef467ac74e35411dd2a10627c0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 31 Jul 2024 13:47:46 +0000 Subject: [PATCH 327/568] Update dependencies from https://github.com/dotnet/diagnostics build 20240730.1 (#7072) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 6 +++--- eng/Versions.props | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6697d2733a1..c45baec431c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,11 +4,11 @@ https://github.com/dotnet/aspnetcore 27f2a011a4211118552dfb8f38d36e8629267d2b - + https://github.com/dotnet/diagnostics 2426e6132aef4add69871e8242392dfab519c211 - + https://github.com/dotnet/diagnostics 2426e6132aef4add69871e8242392dfab519c211 @@ -42,7 +42,7 @@ https://github.com/dotnet/arcade 3e18bd4f62388b829d0b9dcd1ee131431674aa5f - + https://github.com/dotnet/diagnostics 2426e6132aef4add69871e8242392dfab519c211 diff --git a/eng/Versions.props b/eng/Versions.props index c166994653d..c967b775359 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24324.3 - 8.0.0-preview.24379.1 - 8.0.0-preview.24379.1 + 8.0.0-preview.24380.1 + 8.0.0-preview.24380.1 9.0.0-preview.24378.1 @@ -67,7 +67,7 @@ 9.0.100-rc.1.24380.1 - 1.0.537901 + 1.0.538001 $(MicrosoftNETCoreApp31Version) From 0229830649e40f2149e3d06079a42e801e6582b0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 31 Jul 2024 14:08:34 +0000 Subject: [PATCH 328/568] [feature/9.x] Update dependencies from dotnet/arcade (#7058) [feature/9.x] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- global.json | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c45baec431c..1aca7f0ad1a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,25 +22,25 @@ https://github.com/dotnet/roslyn-analyzers 81d9b5d58e3d384ed4a91b75f4a1ece6352e76d9 - + https://github.com/dotnet/arcade - 3e18bd4f62388b829d0b9dcd1ee131431674aa5f + 4f5a4ad88d27b56ceeaa43ced670999c33bd2598 - + https://github.com/dotnet/arcade - 3e18bd4f62388b829d0b9dcd1ee131431674aa5f + 4f5a4ad88d27b56ceeaa43ced670999c33bd2598 - + https://github.com/dotnet/arcade - 3e18bd4f62388b829d0b9dcd1ee131431674aa5f + 4f5a4ad88d27b56ceeaa43ced670999c33bd2598 - + https://github.com/dotnet/arcade - 3e18bd4f62388b829d0b9dcd1ee131431674aa5f + 4f5a4ad88d27b56ceeaa43ced670999c33bd2598 - + https://github.com/dotnet/arcade - 3e18bd4f62388b829d0b9dcd1ee131431674aa5f + 4f5a4ad88d27b56ceeaa43ced670999c33bd2598 https://github.com/dotnet/diagnostics diff --git a/eng/Versions.props b/eng/Versions.props index c967b775359..56ad57d888c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,9 +48,9 @@ --> - 9.0.0-beta.24375.3 - 9.0.0-beta.24375.3 - 9.0.0-beta.24375.3 + 9.0.0-beta.24379.1 + 9.0.0-beta.24379.1 + 9.0.0-beta.24379.1 9.0.0-rc.1.24379.7 9.0.0-rc.1.24379.7 diff --git a/global.json b/global.json index c2125fb3a8d..5ab1c78e357 100644 --- a/global.json +++ b/global.json @@ -31,7 +31,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24375.3", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24375.3" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24379.1", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24379.1" } } From b4b3541a1d665cf44807004f0140017090353f0e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 31 Jul 2024 14:16:03 +0000 Subject: [PATCH 329/568] Update dependencies from https://github.com/dotnet/sdk build 20240730.5 (#7073) [feature/9.x] Update dependencies from dotnet/sdk --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1aca7f0ad1a..6455127a86b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,9 +54,9 @@ https://github.com/dotnet/aspnetcore 27f2a011a4211118552dfb8f38d36e8629267d2b - + https://github.com/dotnet/sdk - 328820c7966e9fa45c519548984a66c25297016c + 10803eca35eef6e685924886ba74caf0bd9439ad https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 56ad57d888c..d7526681f76 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,7 +65,7 @@ 9.0.0-rc.1.24378.5 9.0.0-rc.1.24378.5 - 9.0.100-rc.1.24380.1 + 9.0.100-rc.1.24380.5 1.0.538001 From 85e0bda1764217d9c75ae53e79fe9db2883d5869 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 1 Aug 2024 14:16:14 +0000 Subject: [PATCH 330/568] Update dependencies from https://github.com/dotnet/arcade build 20240801.1 (#7077) [feature/9.x] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- eng/common/native/init-compiler.sh | 4 ++-- global.json | 4 ++-- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6455127a86b..ea1ac10a817 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,25 +22,25 @@ https://github.com/dotnet/roslyn-analyzers 81d9b5d58e3d384ed4a91b75f4a1ece6352e76d9 - + https://github.com/dotnet/arcade - 4f5a4ad88d27b56ceeaa43ced670999c33bd2598 + a3dae8d4fd5a17c147cbecfd31e61463731ac0cc - + https://github.com/dotnet/arcade - 4f5a4ad88d27b56ceeaa43ced670999c33bd2598 + a3dae8d4fd5a17c147cbecfd31e61463731ac0cc - + https://github.com/dotnet/arcade - 4f5a4ad88d27b56ceeaa43ced670999c33bd2598 + a3dae8d4fd5a17c147cbecfd31e61463731ac0cc - + https://github.com/dotnet/arcade - 4f5a4ad88d27b56ceeaa43ced670999c33bd2598 + a3dae8d4fd5a17c147cbecfd31e61463731ac0cc - + https://github.com/dotnet/arcade - 4f5a4ad88d27b56ceeaa43ced670999c33bd2598 + a3dae8d4fd5a17c147cbecfd31e61463731ac0cc https://github.com/dotnet/diagnostics diff --git a/eng/Versions.props b/eng/Versions.props index d7526681f76..ca4b52c5e32 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,9 +48,9 @@ --> - 9.0.0-beta.24379.1 - 9.0.0-beta.24379.1 - 9.0.0-beta.24379.1 + 9.0.0-beta.24401.1 + 9.0.0-beta.24401.1 + 9.0.0-beta.24401.1 9.0.0-rc.1.24379.7 9.0.0-rc.1.24379.7 diff --git a/eng/common/native/init-compiler.sh b/eng/common/native/init-compiler.sh index 14175343cc6..9a0e1f2b456 100644 --- a/eng/common/native/init-compiler.sh +++ b/eng/common/native/init-compiler.sh @@ -21,7 +21,7 @@ case "$compiler" in majorVersion="${version%%.*}" # LLVM based on v18 released in early 2024, with two releases per year - maxVersion="$((18 + ((($(date +%Y) - 2024) * 12 + $(date +%m) - 3) / 6)))" + maxVersion="$((18 + ((($(date +%Y) - 2024) * 12 + $(date +%-m) - 3) / 6)))" compiler=clang ;; @@ -31,7 +31,7 @@ case "$compiler" in majorVersion="${version%%.*}" # GCC based on v14 released in early 2024, with one release per year - maxVersion="$((14 + ((($(date +%Y) - 2024) * 12 + $(date +%m) - 3) / 12)))" + maxVersion="$((14 + ((($(date +%Y) - 2024) * 12 + $(date +%-m) - 3) / 12)))" compiler=gcc ;; esac diff --git a/global.json b/global.json index 5ab1c78e357..abea9c222bb 100644 --- a/global.json +++ b/global.json @@ -31,7 +31,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24379.1", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24379.1" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24401.1", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24401.1" } } From 7438d4f7fe3c5b47c1858ba6a44e0316895189bb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 1 Aug 2024 14:21:02 +0000 Subject: [PATCH 331/568] Update dependencies from https://github.com/dotnet/sdk build 20240731.10 (#7078) [feature/9.x] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Runtime.win-x64: from 9.0.0-rc.1.24379.7 to 9.0.0-rc.1.24381.5 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) - Microsoft.NETCore.App.Runtime.win-x64: from 9.0.0-rc.1.24378.5 to 9.0.0-rc.1.24380.7 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) - VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0: from 9.0.0-rc.1.24379.7 to 9.0.0-rc.1.24381.5 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) - VS.Redist.Common.NetCore.SharedFramework.x64.9.0: from 9.0.0-rc.1.24378.5 to 9.0.0-rc.1.24380.7 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ea1ac10a817..69fe570d931 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/aspnetcore - 27f2a011a4211118552dfb8f38d36e8629267d2b + 5c2dce53828a4435326ae0bce1698a3b8e4824a8 https://github.com/dotnet/diagnostics @@ -46,21 +46,21 @@ https://github.com/dotnet/diagnostics 2426e6132aef4add69871e8242392dfab519c211 - + https://github.com/dotnet/runtime - 0912e94a6c81f4743946831137ba6c3ec3f1a179 + c86bcbb7a573bb09fcb1f4fcd7bc24323e9d6f44 - + https://github.com/dotnet/aspnetcore - 27f2a011a4211118552dfb8f38d36e8629267d2b + 5c2dce53828a4435326ae0bce1698a3b8e4824a8 - + https://github.com/dotnet/sdk - 10803eca35eef6e685924886ba74caf0bd9439ad + 7ef0791037ef761b6767a843bbb8b63d4253a3ab - + https://github.com/dotnet/runtime - 0912e94a6c81f4743946831137ba6c3ec3f1a179 + c86bcbb7a573bb09fcb1f4fcd7bc24323e9d6f44 diff --git a/eng/Versions.props b/eng/Versions.props index ca4b52c5e32..a9f95db5c41 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,8 +52,8 @@ 9.0.0-beta.24401.1 9.0.0-beta.24401.1 - 9.0.0-rc.1.24379.7 - 9.0.0-rc.1.24379.7 + 9.0.0-rc.1.24381.5 + 9.0.0-rc.1.24381.5 2.0.0-beta4.24324.3 @@ -62,10 +62,10 @@ 9.0.0-preview.24378.1 - 9.0.0-rc.1.24378.5 - 9.0.0-rc.1.24378.5 + 9.0.0-rc.1.24380.7 + 9.0.0-rc.1.24380.7 - 9.0.100-rc.1.24380.5 + 9.0.100-rc.1.24381.10 1.0.538001 From 2db46ba8538fd45851b8108a1b4063723fcabc24 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 2 Aug 2024 14:13:17 +0000 Subject: [PATCH 332/568] Update dependencies from https://github.com/dotnet/diagnostics build 20240731.1 (#7080) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 6 +++--- eng/Versions.props | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 69fe570d931..549926dfacf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,11 +4,11 @@ https://github.com/dotnet/aspnetcore 5c2dce53828a4435326ae0bce1698a3b8e4824a8 - + https://github.com/dotnet/diagnostics 2426e6132aef4add69871e8242392dfab519c211 - + https://github.com/dotnet/diagnostics 2426e6132aef4add69871e8242392dfab519c211 @@ -42,7 +42,7 @@ https://github.com/dotnet/arcade a3dae8d4fd5a17c147cbecfd31e61463731ac0cc - + https://github.com/dotnet/diagnostics 2426e6132aef4add69871e8242392dfab519c211 diff --git a/eng/Versions.props b/eng/Versions.props index a9f95db5c41..17e8a387559 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24324.3 - 8.0.0-preview.24380.1 - 8.0.0-preview.24380.1 + 8.0.0-preview.24381.1 + 8.0.0-preview.24381.1 9.0.0-preview.24378.1 @@ -67,7 +67,7 @@ 9.0.100-rc.1.24381.10 - 1.0.538001 + 1.0.538101 $(MicrosoftNETCoreApp31Version) From fa56735faf9d4b70c923299ff84c4b6da65f69b3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 2 Aug 2024 14:39:59 +0000 Subject: [PATCH 333/568] Update dependencies from https://github.com/dotnet/sdk build 20240802.3 (#7081) [feature/9.x] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NETCore.App.Runtime.win-x64: from 9.0.0-rc.1.24380.7 to 9.0.0-rc.1.24401.2 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) - VS.Redist.Common.NetCore.SharedFramework.x64.9.0: from 9.0.0-rc.1.24380.7 to 9.0.0-rc.1.24401.2 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 549926dfacf..d715ed530ce 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -46,21 +46,21 @@ https://github.com/dotnet/diagnostics 2426e6132aef4add69871e8242392dfab519c211 - + https://github.com/dotnet/runtime - c86bcbb7a573bb09fcb1f4fcd7bc24323e9d6f44 + 03b4c7945acfeb547eb9243f8875a3c4bb49eb9b https://github.com/dotnet/aspnetcore 5c2dce53828a4435326ae0bce1698a3b8e4824a8 - + https://github.com/dotnet/sdk - 7ef0791037ef761b6767a843bbb8b63d4253a3ab + fdbb7b29db83e6eabbdfc1bfff3e25ac2c7a05cf - + https://github.com/dotnet/runtime - c86bcbb7a573bb09fcb1f4fcd7bc24323e9d6f44 + 03b4c7945acfeb547eb9243f8875a3c4bb49eb9b diff --git a/eng/Versions.props b/eng/Versions.props index 17e8a387559..a1966cd4108 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -62,10 +62,10 @@ 9.0.0-preview.24378.1 - 9.0.0-rc.1.24380.7 - 9.0.0-rc.1.24380.7 + 9.0.0-rc.1.24401.2 + 9.0.0-rc.1.24401.2 - 9.0.100-rc.1.24381.10 + 9.0.100-rc.1.24402.3 1.0.538101 From be46c587b212a4b92862ba3194053a41170edc7d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 3 Aug 2024 14:53:32 +0000 Subject: [PATCH 334/568] Update dependencies from https://github.com/dotnet/sdk build 20240802.5 (#7085) [feature/9.x] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Runtime.win-x64: from 9.0.0-rc.1.24381.5 to 9.0.0-rc.1.24402.1 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) - VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0: from 9.0.0-rc.1.24381.5 to 9.0.0-rc.1.24402.1 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d715ed530ce..6986e7099bf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/aspnetcore - 5c2dce53828a4435326ae0bce1698a3b8e4824a8 + 1d88c6cf5e0b62050f4b17431b9a34fa9e26070a https://github.com/dotnet/diagnostics @@ -50,13 +50,13 @@ https://github.com/dotnet/runtime 03b4c7945acfeb547eb9243f8875a3c4bb49eb9b - + https://github.com/dotnet/aspnetcore - 5c2dce53828a4435326ae0bce1698a3b8e4824a8 + 1d88c6cf5e0b62050f4b17431b9a34fa9e26070a - + https://github.com/dotnet/sdk - fdbb7b29db83e6eabbdfc1bfff3e25ac2c7a05cf + 02d34d95b9297ec43e678120b33473b618aecde3 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index a1966cd4108..6a686ca13d7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,8 +52,8 @@ 9.0.0-beta.24401.1 9.0.0-beta.24401.1 - 9.0.0-rc.1.24381.5 - 9.0.0-rc.1.24381.5 + 9.0.0-rc.1.24402.1 + 9.0.0-rc.1.24402.1 2.0.0-beta4.24324.3 @@ -65,7 +65,7 @@ 9.0.0-rc.1.24401.2 9.0.0-rc.1.24401.2 - 9.0.100-rc.1.24402.3 + 9.0.100-rc.1.24402.5 1.0.538101 From 17cb1ea8f4060fa1e5ba4514ed3a9fa2c4521a31 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 4 Aug 2024 15:01:04 +0000 Subject: [PATCH 335/568] Update dependencies from https://github.com/dotnet/sdk build 20240803.1 (#7086) [feature/9.x] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NETCore.App.Runtime.win-x64: from 9.0.0-rc.1.24401.2 to 9.0.0-rc.1.24401.5 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) - VS.Redist.Common.NetCore.SharedFramework.x64.9.0: from 9.0.0-rc.1.24401.2 to 9.0.0-rc.1.24401.5 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6986e7099bf..acbc0443f9a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -46,21 +46,21 @@ https://github.com/dotnet/diagnostics 2426e6132aef4add69871e8242392dfab519c211 - + https://github.com/dotnet/runtime - 03b4c7945acfeb547eb9243f8875a3c4bb49eb9b + ae30cbaf993d757eec8bfc3420b152e1a7bc4af0 https://github.com/dotnet/aspnetcore 1d88c6cf5e0b62050f4b17431b9a34fa9e26070a - + https://github.com/dotnet/sdk - 02d34d95b9297ec43e678120b33473b618aecde3 + 4ff7444919a479f3a2e681a9807ae194680d7975 - + https://github.com/dotnet/runtime - 03b4c7945acfeb547eb9243f8875a3c4bb49eb9b + ae30cbaf993d757eec8bfc3420b152e1a7bc4af0 diff --git a/eng/Versions.props b/eng/Versions.props index 6a686ca13d7..837f2861901 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -62,10 +62,10 @@ 9.0.0-preview.24378.1 - 9.0.0-rc.1.24401.2 - 9.0.0-rc.1.24401.2 + 9.0.0-rc.1.24401.5 + 9.0.0-rc.1.24401.5 - 9.0.100-rc.1.24402.5 + 9.0.100-rc.1.24403.1 1.0.538101 From b8dbee2b6b37c45ef0eae5ee7e18f1adb2922f0f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 5 Aug 2024 14:27:21 +0000 Subject: [PATCH 336/568] Update dependencies from https://github.com/dotnet/diagnostics build 20240802.1 (#7091) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index acbc0443f9a..61fd4d91416 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore 1d88c6cf5e0b62050f4b17431b9a34fa9e26070a - + https://github.com/dotnet/diagnostics - 2426e6132aef4add69871e8242392dfab519c211 + fb2a705b0a62b70ae350014990d78aa5af9fa74e - + https://github.com/dotnet/diagnostics - 2426e6132aef4add69871e8242392dfab519c211 + fb2a705b0a62b70ae350014990d78aa5af9fa74e https://github.com/dotnet/command-line-api @@ -42,9 +42,9 @@ https://github.com/dotnet/arcade a3dae8d4fd5a17c147cbecfd31e61463731ac0cc - + https://github.com/dotnet/diagnostics - 2426e6132aef4add69871e8242392dfab519c211 + fb2a705b0a62b70ae350014990d78aa5af9fa74e https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 837f2861901..2ee6fef9227 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24324.3 - 8.0.0-preview.24381.1 - 8.0.0-preview.24381.1 + 8.0.0-preview.24402.1 + 8.0.0-preview.24402.1 9.0.0-preview.24378.1 @@ -67,7 +67,7 @@ 9.0.100-rc.1.24403.1 - 1.0.538101 + 1.0.540201 $(MicrosoftNETCoreApp31Version) From 6f6a004f75ef5281b8b70f354e5491d30e85fcbd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 5 Aug 2024 15:25:11 -0700 Subject: [PATCH 337/568] [feature/9.x] Update dependencies from dotnet/roslyn-analyzers (#7084) * Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20240802.1 Microsoft.CodeAnalysis.NetAnalyzers From Version 9.0.0-preview.24378.1 -> To Version 9.0.0-preview.24402.1 * Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20240802.1 Microsoft.CodeAnalysis.NetAnalyzers From Version 9.0.0-preview.24378.1 -> To Version 9.0.0-preview.24402.1 * Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20240802.1 Microsoft.CodeAnalysis.NetAnalyzers From Version 9.0.0-preview.24378.1 -> To Version 9.0.0-preview.24402.1 --------- Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 61fd4d91416..fa99753d1e8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -18,9 +18,9 @@ - + https://github.com/dotnet/roslyn-analyzers - 81d9b5d58e3d384ed4a91b75f4a1ece6352e76d9 + b70b32099c2365092974f6786636e25ae507c8fa https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 2ee6fef9227..d4646f6aa89 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -60,7 +60,7 @@ 8.0.0-preview.24402.1 8.0.0-preview.24402.1 - 9.0.0-preview.24378.1 + 9.0.0-preview.24402.1 9.0.0-rc.1.24401.5 9.0.0-rc.1.24401.5 From 3f27e49595014254d2a3b5c08a1c680743597c49 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 7 Aug 2024 14:06:13 +0000 Subject: [PATCH 338/568] Update dependencies from https://github.com/dotnet/diagnostics build 20240806.1 (#7115) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fa99753d1e8..49bf97831fc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore 1d88c6cf5e0b62050f4b17431b9a34fa9e26070a - + https://github.com/dotnet/diagnostics - fb2a705b0a62b70ae350014990d78aa5af9fa74e + 2c1994334add963416f2f4431152c58504fbc443 - + https://github.com/dotnet/diagnostics - fb2a705b0a62b70ae350014990d78aa5af9fa74e + 2c1994334add963416f2f4431152c58504fbc443 https://github.com/dotnet/command-line-api @@ -42,9 +42,9 @@ https://github.com/dotnet/arcade a3dae8d4fd5a17c147cbecfd31e61463731ac0cc - + https://github.com/dotnet/diagnostics - fb2a705b0a62b70ae350014990d78aa5af9fa74e + 2c1994334add963416f2f4431152c58504fbc443 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index d4646f6aa89..e6b076ccd26 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24324.3 - 8.0.0-preview.24402.1 - 8.0.0-preview.24402.1 + 8.0.0-preview.24406.1 + 8.0.0-preview.24406.1 9.0.0-preview.24402.1 @@ -67,7 +67,7 @@ 9.0.100-rc.1.24403.1 - 1.0.540201 + 1.0.540601 $(MicrosoftNETCoreApp31Version) From 53f6d3e0a30e5f98cae93f3303b5ffcb2b09210f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 7 Aug 2024 14:44:17 +0000 Subject: [PATCH 339/568] Update dependencies from https://github.com/dotnet/arcade build 20240805.1 (#7116) [feature/9.x] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- global.json | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 49bf97831fc..be9e554c06d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,25 +22,25 @@ https://github.com/dotnet/roslyn-analyzers b70b32099c2365092974f6786636e25ae507c8fa - + https://github.com/dotnet/arcade - a3dae8d4fd5a17c147cbecfd31e61463731ac0cc + 2c829550b968e29389ce8392244da2b006d71301 - + https://github.com/dotnet/arcade - a3dae8d4fd5a17c147cbecfd31e61463731ac0cc + 2c829550b968e29389ce8392244da2b006d71301 - + https://github.com/dotnet/arcade - a3dae8d4fd5a17c147cbecfd31e61463731ac0cc + 2c829550b968e29389ce8392244da2b006d71301 - + https://github.com/dotnet/arcade - a3dae8d4fd5a17c147cbecfd31e61463731ac0cc + 2c829550b968e29389ce8392244da2b006d71301 - + https://github.com/dotnet/arcade - a3dae8d4fd5a17c147cbecfd31e61463731ac0cc + 2c829550b968e29389ce8392244da2b006d71301 https://github.com/dotnet/diagnostics diff --git a/eng/Versions.props b/eng/Versions.props index e6b076ccd26..7fede9b5b42 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,9 +48,9 @@ --> - 9.0.0-beta.24401.1 - 9.0.0-beta.24401.1 - 9.0.0-beta.24401.1 + 9.0.0-beta.24405.1 + 9.0.0-beta.24405.1 + 9.0.0-beta.24405.1 9.0.0-rc.1.24402.1 9.0.0-rc.1.24402.1 diff --git a/global.json b/global.json index abea9c222bb..2e9f4f4d7aa 100644 --- a/global.json +++ b/global.json @@ -31,7 +31,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24401.1", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24401.1" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24405.1", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24405.1" } } From 826a3191cc6bbcffac9c3a81fdb668e34577ade9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 7 Aug 2024 15:19:28 +0000 Subject: [PATCH 340/568] Update dependencies from https://github.com/dotnet/sdk build 20240806.36 (#7118) [feature/9.x] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Runtime.win-x64: from 9.0.0-rc.1.24402.1 to 9.0.0-rc.1.24406.7 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) - Microsoft.NETCore.App.Runtime.win-x64: from 9.0.0-rc.1.24401.5 to 9.0.0-rc.1.24403.1 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) - VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0: from 9.0.0-rc.1.24402.1 to 9.0.0-rc.1.24406.7 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) - VS.Redist.Common.NetCore.SharedFramework.x64.9.0: from 9.0.0-rc.1.24401.5 to 9.0.0-rc.1.24403.1 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index be9e554c06d..0dc155832c1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/aspnetcore - 1d88c6cf5e0b62050f4b17431b9a34fa9e26070a + c43053635afd8b3b9c0f805384936ba4c58d94fe https://github.com/dotnet/diagnostics @@ -46,21 +46,21 @@ https://github.com/dotnet/diagnostics 2c1994334add963416f2f4431152c58504fbc443 - + https://github.com/dotnet/runtime - ae30cbaf993d757eec8bfc3420b152e1a7bc4af0 + 1cc0186c3e120ee4ed0494cf74fef0a3ef0118d6 - + https://github.com/dotnet/aspnetcore - 1d88c6cf5e0b62050f4b17431b9a34fa9e26070a + c43053635afd8b3b9c0f805384936ba4c58d94fe - + https://github.com/dotnet/sdk - 4ff7444919a479f3a2e681a9807ae194680d7975 + 32ea7ddd4d2bd6c34508d4439ed5a10c04b42fef - + https://github.com/dotnet/runtime - ae30cbaf993d757eec8bfc3420b152e1a7bc4af0 + 1cc0186c3e120ee4ed0494cf74fef0a3ef0118d6 diff --git a/eng/Versions.props b/eng/Versions.props index 7fede9b5b42..e52c635fbc6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,8 +52,8 @@ 9.0.0-beta.24405.1 9.0.0-beta.24405.1 - 9.0.0-rc.1.24402.1 - 9.0.0-rc.1.24402.1 + 9.0.0-rc.1.24406.7 + 9.0.0-rc.1.24406.7 2.0.0-beta4.24324.3 @@ -62,10 +62,10 @@ 9.0.0-preview.24402.1 - 9.0.0-rc.1.24401.5 - 9.0.0-rc.1.24401.5 + 9.0.0-rc.1.24403.1 + 9.0.0-rc.1.24403.1 - 9.0.100-rc.1.24403.1 + 9.0.100-rc.1.24406.36 1.0.540601 From 47b5a89823eeb6429233a235ab2d825891c83562 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 8 Aug 2024 14:03:31 +0000 Subject: [PATCH 341/568] Update dependencies from https://github.com/dotnet/diagnostics build 20240807.1 (#7120) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0dc155832c1..1120699a428 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore c43053635afd8b3b9c0f805384936ba4c58d94fe - + https://github.com/dotnet/diagnostics - 2c1994334add963416f2f4431152c58504fbc443 + 408b9e7ae74a6cebe28a6e21fc719d882fe2191e - + https://github.com/dotnet/diagnostics - 2c1994334add963416f2f4431152c58504fbc443 + 408b9e7ae74a6cebe28a6e21fc719d882fe2191e https://github.com/dotnet/command-line-api @@ -42,9 +42,9 @@ https://github.com/dotnet/arcade 2c829550b968e29389ce8392244da2b006d71301 - + https://github.com/dotnet/diagnostics - 2c1994334add963416f2f4431152c58504fbc443 + 408b9e7ae74a6cebe28a6e21fc719d882fe2191e https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index e52c635fbc6..d6707c73549 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24324.3 - 8.0.0-preview.24406.1 - 8.0.0-preview.24406.1 + 8.0.0-preview.24407.1 + 8.0.0-preview.24407.1 9.0.0-preview.24402.1 @@ -67,7 +67,7 @@ 9.0.100-rc.1.24406.36 - 1.0.540601 + 1.0.540701 $(MicrosoftNETCoreApp31Version) From 4900bc6010e1aaf30e9f923c8bd3eb0997c82ace Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 8 Aug 2024 14:04:20 +0000 Subject: [PATCH 342/568] Update dependencies from https://github.com/dotnet/sdk build 20240808.2 (#7122) [feature/9.x] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Runtime.win-x64: from 9.0.0-rc.1.24406.7 to 9.0.0-rc.1.24407.10 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) - Microsoft.NETCore.App.Runtime.win-x64: from 9.0.0-rc.1.24403.1 to 9.0.0-rc.1.24406.14 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) - VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0: from 9.0.0-rc.1.24406.7 to 9.0.0-rc.1.24407.10 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) - VS.Redist.Common.NetCore.SharedFramework.x64.9.0: from 9.0.0-rc.1.24403.1 to 9.0.0-rc.1.24406.14 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1120699a428..ae98290bc8a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/aspnetcore - c43053635afd8b3b9c0f805384936ba4c58d94fe + 257d69079e0f7fc84e3f6cd5047272d7f79b4d66 https://github.com/dotnet/diagnostics @@ -46,21 +46,21 @@ https://github.com/dotnet/diagnostics 408b9e7ae74a6cebe28a6e21fc719d882fe2191e - + https://github.com/dotnet/runtime - 1cc0186c3e120ee4ed0494cf74fef0a3ef0118d6 + 4985021ebfff545de02caa3386e3dd4b21784b95 - + https://github.com/dotnet/aspnetcore - c43053635afd8b3b9c0f805384936ba4c58d94fe + 257d69079e0f7fc84e3f6cd5047272d7f79b4d66 - + https://github.com/dotnet/sdk - 32ea7ddd4d2bd6c34508d4439ed5a10c04b42fef + 196789faffa0e93c86061e44bb9d1852f10d09bc - + https://github.com/dotnet/runtime - 1cc0186c3e120ee4ed0494cf74fef0a3ef0118d6 + 4985021ebfff545de02caa3386e3dd4b21784b95 diff --git a/eng/Versions.props b/eng/Versions.props index d6707c73549..1354380a2cf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,8 +52,8 @@ 9.0.0-beta.24405.1 9.0.0-beta.24405.1 - 9.0.0-rc.1.24406.7 - 9.0.0-rc.1.24406.7 + 9.0.0-rc.1.24407.10 + 9.0.0-rc.1.24407.10 2.0.0-beta4.24324.3 @@ -62,10 +62,10 @@ 9.0.0-preview.24402.1 - 9.0.0-rc.1.24403.1 - 9.0.0-rc.1.24403.1 + 9.0.0-rc.1.24406.14 + 9.0.0-rc.1.24406.14 - 9.0.100-rc.1.24406.36 + 9.0.100-rc.1.24408.2 1.0.540701 From f7fefcbce75662cff5af06c277116a561bbf8399 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 8 Aug 2024 14:06:00 +0000 Subject: [PATCH 343/568] Update dependencies from https://github.com/dotnet/arcade build 20240808.1 (#7121) [feature/9.x] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- global.json | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ae98290bc8a..1c62553d06a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,25 +22,25 @@ https://github.com/dotnet/roslyn-analyzers b70b32099c2365092974f6786636e25ae507c8fa - + https://github.com/dotnet/arcade - 2c829550b968e29389ce8392244da2b006d71301 + 610e251fc34686333b98188320ca1eecd7e6af6c - + https://github.com/dotnet/arcade - 2c829550b968e29389ce8392244da2b006d71301 + 610e251fc34686333b98188320ca1eecd7e6af6c - + https://github.com/dotnet/arcade - 2c829550b968e29389ce8392244da2b006d71301 + 610e251fc34686333b98188320ca1eecd7e6af6c - + https://github.com/dotnet/arcade - 2c829550b968e29389ce8392244da2b006d71301 + 610e251fc34686333b98188320ca1eecd7e6af6c - + https://github.com/dotnet/arcade - 2c829550b968e29389ce8392244da2b006d71301 + 610e251fc34686333b98188320ca1eecd7e6af6c https://github.com/dotnet/diagnostics diff --git a/eng/Versions.props b/eng/Versions.props index 1354380a2cf..994049f7b42 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,9 +48,9 @@ --> - 9.0.0-beta.24405.1 - 9.0.0-beta.24405.1 - 9.0.0-beta.24405.1 + 9.0.0-beta.24408.1 + 9.0.0-beta.24408.1 + 9.0.0-beta.24408.1 9.0.0-rc.1.24407.10 9.0.0-rc.1.24407.10 diff --git a/global.json b/global.json index 2e9f4f4d7aa..905504c2cfb 100644 --- a/global.json +++ b/global.json @@ -31,7 +31,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24405.1", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24405.1" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24408.1", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24408.1" } } From d63655f32c16394d449303b2c1160560789d541d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 9 Aug 2024 13:38:11 +0000 Subject: [PATCH 344/568] Update dependencies from https://github.com/dotnet/diagnostics build 20240808.1 (#7129) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1c62553d06a..104b25ee415 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore 257d69079e0f7fc84e3f6cd5047272d7f79b4d66 - + https://github.com/dotnet/diagnostics - 408b9e7ae74a6cebe28a6e21fc719d882fe2191e + 5838149521e80185e0dbe79720bd9ce6e81d2d35 - + https://github.com/dotnet/diagnostics - 408b9e7ae74a6cebe28a6e21fc719d882fe2191e + 5838149521e80185e0dbe79720bd9ce6e81d2d35 https://github.com/dotnet/command-line-api @@ -42,9 +42,9 @@ https://github.com/dotnet/arcade 610e251fc34686333b98188320ca1eecd7e6af6c - + https://github.com/dotnet/diagnostics - 408b9e7ae74a6cebe28a6e21fc719d882fe2191e + 5838149521e80185e0dbe79720bd9ce6e81d2d35 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 994049f7b42..463aa5c057a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24324.3 - 8.0.0-preview.24407.1 - 8.0.0-preview.24407.1 + 8.0.0-preview.24408.1 + 8.0.0-preview.24408.1 9.0.0-preview.24402.1 @@ -67,7 +67,7 @@ 9.0.100-rc.1.24408.2 - 1.0.540701 + 1.0.540801 $(MicrosoftNETCoreApp31Version) From d3de60689662bd9aa0b88216146d2aabbbbe01d5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 9 Aug 2024 13:49:41 +0000 Subject: [PATCH 345/568] Update dependencies from https://github.com/dotnet/arcade build 20240808.2 (#7130) [feature/9.x] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- eng/common/darc-init.ps1 | 2 +- eng/common/darc-init.sh | 2 +- global.json | 4 ++-- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 104b25ee415..6ad56c4f2cc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,25 +22,25 @@ https://github.com/dotnet/roslyn-analyzers b70b32099c2365092974f6786636e25ae507c8fa - + https://github.com/dotnet/arcade - 610e251fc34686333b98188320ca1eecd7e6af6c + 60ae233c3d77f11c5fdb53e570b64d503b13ba59 - + https://github.com/dotnet/arcade - 610e251fc34686333b98188320ca1eecd7e6af6c + 60ae233c3d77f11c5fdb53e570b64d503b13ba59 - + https://github.com/dotnet/arcade - 610e251fc34686333b98188320ca1eecd7e6af6c + 60ae233c3d77f11c5fdb53e570b64d503b13ba59 - + https://github.com/dotnet/arcade - 610e251fc34686333b98188320ca1eecd7e6af6c + 60ae233c3d77f11c5fdb53e570b64d503b13ba59 - + https://github.com/dotnet/arcade - 610e251fc34686333b98188320ca1eecd7e6af6c + 60ae233c3d77f11c5fdb53e570b64d503b13ba59 https://github.com/dotnet/diagnostics diff --git a/eng/Versions.props b/eng/Versions.props index 463aa5c057a..c3df152aeaf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,9 +48,9 @@ --> - 9.0.0-beta.24408.1 - 9.0.0-beta.24408.1 - 9.0.0-beta.24408.1 + 9.0.0-beta.24408.2 + 9.0.0-beta.24408.2 + 9.0.0-beta.24408.2 9.0.0-rc.1.24407.10 9.0.0-rc.1.24407.10 diff --git a/eng/common/darc-init.ps1 b/eng/common/darc-init.ps1 index 8fda30bdce2..e3374310563 100644 --- a/eng/common/darc-init.ps1 +++ b/eng/common/darc-init.ps1 @@ -1,6 +1,6 @@ param ( $darcVersion = $null, - $versionEndpoint = 'https://maestro.dot.net/api/assets/darc-version?api-version=2019-01-16', + $versionEndpoint = 'https://maestro.dot.net/api/assets/darc-version?api-version=2020-02-20', $verbosity = 'minimal', $toolpath = $null ) diff --git a/eng/common/darc-init.sh b/eng/common/darc-init.sh index c305ae6bd77..36dbd45e1ce 100644 --- a/eng/common/darc-init.sh +++ b/eng/common/darc-init.sh @@ -2,7 +2,7 @@ source="${BASH_SOURCE[0]}" darcVersion='' -versionEndpoint='https://maestro.dot.net/api/assets/darc-version?api-version=2019-01-16' +versionEndpoint='https://maestro.dot.net/api/assets/darc-version?api-version=2020-02-20' verbosity='minimal' while [[ $# > 0 ]]; do diff --git a/global.json b/global.json index 905504c2cfb..b8d9171d6ef 100644 --- a/global.json +++ b/global.json @@ -31,7 +31,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24408.1", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24408.1" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24408.2", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24408.2" } } From 3ec3f499bfffc07f12f02e9ad669e05d1a741141 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 9 Aug 2024 13:53:41 +0000 Subject: [PATCH 346/568] Update dependencies from https://github.com/dotnet/sdk build 20240809.1 (#7131) [feature/9.x] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NETCore.App.Runtime.win-x64: from 9.0.0-rc.1.24406.14 to 9.0.0-rc.1.24408.12 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) - VS.Redist.Common.NetCore.SharedFramework.x64.9.0: from 9.0.0-rc.1.24406.14 to 9.0.0-rc.1.24408.12 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6ad56c4f2cc..2889b54fea1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -46,21 +46,21 @@ https://github.com/dotnet/diagnostics 5838149521e80185e0dbe79720bd9ce6e81d2d35 - + https://github.com/dotnet/runtime - 4985021ebfff545de02caa3386e3dd4b21784b95 + 68511fd27fe4055ce5203742998ba12019dfcbd4 https://github.com/dotnet/aspnetcore 257d69079e0f7fc84e3f6cd5047272d7f79b4d66 - + https://github.com/dotnet/sdk - 196789faffa0e93c86061e44bb9d1852f10d09bc + 43360291a50c9c7c471551f8f8363919d38014ea - + https://github.com/dotnet/runtime - 4985021ebfff545de02caa3386e3dd4b21784b95 + 68511fd27fe4055ce5203742998ba12019dfcbd4 diff --git a/eng/Versions.props b/eng/Versions.props index c3df152aeaf..8186b1c7069 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -62,10 +62,10 @@ 9.0.0-preview.24402.1 - 9.0.0-rc.1.24406.14 - 9.0.0-rc.1.24406.14 + 9.0.0-rc.1.24408.12 + 9.0.0-rc.1.24408.12 - 9.0.100-rc.1.24408.2 + 9.0.100-rc.1.24409.1 1.0.540801 From 624eba9f3b482ab348a85935f6a504c57c956445 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 13 Aug 2024 09:04:30 -0700 Subject: [PATCH 347/568] Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20240805.1 (#7117) Microsoft.CodeAnalysis.NetAnalyzers From Version 9.0.0-preview.24402.1 -> To Version 9.0.0-preview.24405.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2889b54fea1..df77e004161 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -18,9 +18,9 @@ - + https://github.com/dotnet/roslyn-analyzers - b70b32099c2365092974f6786636e25ae507c8fa + 3211f48253bc18560156d90dc5e710d35f7d03fa https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 8186b1c7069..63282dc6c02 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -60,7 +60,7 @@ 8.0.0-preview.24408.1 8.0.0-preview.24408.1 - 9.0.0-preview.24402.1 + 9.0.0-preview.24405.1 9.0.0-rc.1.24408.12 9.0.0-rc.1.24408.12 From 5afd72580b5e76fccac94477b8ac82ec72bbfbec Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 13 Aug 2024 09:15:33 -0700 Subject: [PATCH 348/568] [feature/9.x] Sync branch with origin/main (#7137) * Move Azure.Identity to azure-sdk-dependencies group (#7110) * Fix spelling in release notes (#7113) * generate release notes (#7124) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * generate release notes (#7125) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * generate release notes (#7128) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --------- Co-authored-by: Justin Anderson Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- .github/dependabot.template.yml | 2 +- .github/dependabot.yml | 6 +++--- documentation/releaseNotes/releaseNotes.v6.3.8.md | 7 +++++++ documentation/releaseNotes/releaseNotes.v8.0.4.md | 7 +++++++ .../releaseNotes/releaseNotes.v9.0.0-preview.6.md | 4 ++-- .../releaseNotes/releaseNotes.v9.0.0-preview.7.md | 7 +++++++ 6 files changed, 27 insertions(+), 6 deletions(-) create mode 100644 documentation/releaseNotes/releaseNotes.v6.3.8.md create mode 100644 documentation/releaseNotes/releaseNotes.v8.0.4.md create mode 100644 documentation/releaseNotes/releaseNotes.v9.0.0-preview.7.md diff --git a/.github/dependabot.template.yml b/.github/dependabot.template.yml index cba06c5a66b..1ded330b3fc 100644 --- a/.github/dependabot.template.yml +++ b/.github/dependabot.template.yml @@ -55,10 +55,10 @@ updates: azure-sdk-dependencies: patterns: - "Azure.Core" + - "Azure.Identity" - "Azure.Storage.*" identity-dependencies: patterns: - - "Azure.Identity" - "Microsoft.Identity.*" - "Microsoft.IdentityModel.*" - package-ecosystem: "nuget" diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 8e458579ebc..0e073711504 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -21,10 +21,10 @@ updates: azure-sdk-dependencies: patterns: - Azure.Core + - Azure.Identity - Azure.Storage.* identity-dependencies: patterns: - - Azure.Identity - Microsoft.Identity.* - Microsoft.IdentityModel.* - package-ecosystem: nuget @@ -98,10 +98,10 @@ updates: azure-sdk-dependencies: patterns: - Azure.Core + - Azure.Identity - Azure.Storage.* identity-dependencies: patterns: - - Azure.Identity - Microsoft.Identity.* - Microsoft.IdentityModel.* - package-ecosystem: nuget @@ -179,10 +179,10 @@ updates: azure-sdk-dependencies: patterns: - Azure.Core + - Azure.Identity - Azure.Storage.* identity-dependencies: patterns: - - Azure.Identity - Microsoft.Identity.* - Microsoft.IdentityModel.* - package-ecosystem: nuget diff --git a/documentation/releaseNotes/releaseNotes.v6.3.8.md b/documentation/releaseNotes/releaseNotes.v6.3.8.md new file mode 100644 index 00000000000..d1f202176ae --- /dev/null +++ b/documentation/releaseNotes/releaseNotes.v6.3.8.md @@ -0,0 +1,7 @@ +Today we are releasing the 6.3.8 build of the `dotnet monitor` tool. This release includes: + +- Updated dependencies + + + +If you would like to provide additional feedback to the team [please fill out this survey](https://aka.ms/dotnet-monitor-survey?src=rn). \ No newline at end of file diff --git a/documentation/releaseNotes/releaseNotes.v8.0.4.md b/documentation/releaseNotes/releaseNotes.v8.0.4.md new file mode 100644 index 00000000000..a1d1a0ad8a2 --- /dev/null +++ b/documentation/releaseNotes/releaseNotes.v8.0.4.md @@ -0,0 +1,7 @@ +Today we are releasing the 8.0.4 build of the `dotnet monitor` tool. This release includes: + +- Updated dependencies + + + +If you would like to provide additional feedback to the team [please fill out this survey](https://aka.ms/dotnet-monitor-survey?src=rn). \ No newline at end of file diff --git a/documentation/releaseNotes/releaseNotes.v9.0.0-preview.6.md b/documentation/releaseNotes/releaseNotes.v9.0.0-preview.6.md index d119220d936..5dafdbc37f4 100644 --- a/documentation/releaseNotes/releaseNotes.v9.0.0-preview.6.md +++ b/documentation/releaseNotes/releaseNotes.v9.0.0-preview.6.md @@ -1,8 +1,8 @@ Today we are releasing the next official preview version of the `dotnet monitor` tool. This release includes: -- CallStackFrame JSON results now include methodtoken and moduleversionid. ([#6839](https://github.com/dotnet/dotnet-monitor/pull/6839)) +- CallStackFrame JSON results now include method token and module version ID. ([#6839](https://github.com/dotnet/dotnet-monitor/pull/6839)) - The S3 egress provider now provides the ability to use KMS encryption keys to encrypt artifacts placed in S3 buckets ([#6831](https://github.com/dotnet/dotnet-monitor/pull/6831)) -If you would like to provide additional feedback to the team [please fill out this survey](https://aka.ms/dotnet-monitor-survey?src=rn). \ No newline at end of file +If you would like to provide additional feedback to the team [please fill out this survey](https://aka.ms/dotnet-monitor-survey?src=rn). diff --git a/documentation/releaseNotes/releaseNotes.v9.0.0-preview.7.md b/documentation/releaseNotes/releaseNotes.v9.0.0-preview.7.md new file mode 100644 index 00000000000..d3057872a43 --- /dev/null +++ b/documentation/releaseNotes/releaseNotes.v9.0.0-preview.7.md @@ -0,0 +1,7 @@ +Today we are releasing the next official preview version of the `dotnet monitor` tool. This release includes: + +- Adds support for overriding the artifact name for `Collect*` actions and adds new placeholders for `HostName` and `UnixTime`. ([#6675](https://github.com/dotnet/dotnet-monitor/pull/6675)) + + + +If you would like to provide additional feedback to the team [please fill out this survey](https://aka.ms/dotnet-monitor-survey?src=rn). \ No newline at end of file From 5fc00eb3e4aa26d4b37e3c2702158260da2fa957 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 13 Aug 2024 17:05:16 +0000 Subject: [PATCH 349/568] Update dependencies from https://github.com/dotnet/sdk build 20240813.1 (#7143) [feature/9.x] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Runtime.win-x64: from 9.0.0-rc.1.24407.10 to 9.0.0-rc.1.24412.15 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) - Microsoft.NETCore.App.Runtime.win-x64: from 9.0.0-rc.1.24408.12 to 9.0.0-rc.1.24410.5 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) - VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0: from 9.0.0-rc.1.24407.10 to 9.0.0-rc.1.24412.15 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) - VS.Redist.Common.NetCore.SharedFramework.x64.9.0: from 9.0.0-rc.1.24408.12 to 9.0.0-rc.1.24410.5 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index df77e004161..593b08054b6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/aspnetcore - 257d69079e0f7fc84e3f6cd5047272d7f79b4d66 + abbd67b97144c14ef60cdeb416ad9c5d75356c7f https://github.com/dotnet/diagnostics @@ -46,21 +46,21 @@ https://github.com/dotnet/diagnostics 5838149521e80185e0dbe79720bd9ce6e81d2d35 - + https://github.com/dotnet/runtime - 68511fd27fe4055ce5203742998ba12019dfcbd4 + 7cb32e193a55a95c74fc3bd56501b951b48b700f - + https://github.com/dotnet/aspnetcore - 257d69079e0f7fc84e3f6cd5047272d7f79b4d66 + abbd67b97144c14ef60cdeb416ad9c5d75356c7f - + https://github.com/dotnet/sdk - 43360291a50c9c7c471551f8f8363919d38014ea + 2c9444fa240f0084ef9dc6d6100bbfd75b0648b1 - + https://github.com/dotnet/runtime - 68511fd27fe4055ce5203742998ba12019dfcbd4 + 7cb32e193a55a95c74fc3bd56501b951b48b700f diff --git a/eng/Versions.props b/eng/Versions.props index 63282dc6c02..cdc643b44a8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,8 +52,8 @@ 9.0.0-beta.24408.2 9.0.0-beta.24408.2 - 9.0.0-rc.1.24407.10 - 9.0.0-rc.1.24407.10 + 9.0.0-rc.1.24412.15 + 9.0.0-rc.1.24412.15 2.0.0-beta4.24324.3 @@ -62,10 +62,10 @@ 9.0.0-preview.24405.1 - 9.0.0-rc.1.24408.12 - 9.0.0-rc.1.24408.12 + 9.0.0-rc.1.24410.5 + 9.0.0-rc.1.24410.5 - 9.0.100-rc.1.24409.1 + 9.0.100-rc.1.24413.1 1.0.540801 From a8001d572ea33f64498a51c366c6280a441df75c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 13 Aug 2024 17:55:05 +0000 Subject: [PATCH 350/568] update release information (#7144) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index cdc643b44a8..d7e91cd9c74 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -4,8 +4,8 @@ https://github.com/dotnet/dotnet-monitor 9.0.0 - preview - 7 + rc + 1 true - 9.0.100-rc.1.24413.1 + 9.0.100-rc.1.24414.7 1.0.540801 From 060fa9ffaee29783b7db651e3c3cd28cf60f6909 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 14 Aug 2024 13:04:54 -0700 Subject: [PATCH 352/568] [feature/9.x] Update dependencies from dotnet/diagnostics (#7142) * Update dependencies from https://github.com/dotnet/diagnostics build 20240812.1 Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe , Microsoft.FileFormats From Version 8.0.0-preview.24408.1 -> To Version 8.0.0-preview.24412.1 * Update dependencies from https://github.com/dotnet/diagnostics build 20240813.1 Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe , Microsoft.FileFormats From Version 8.0.0-preview.24412.1 -> To Version 8.0.0-preview.24413.1 --------- Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 47e431e150f..00ac6f97ffc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore abbd67b97144c14ef60cdeb416ad9c5d75356c7f - + https://github.com/dotnet/diagnostics - 5838149521e80185e0dbe79720bd9ce6e81d2d35 + afc42cb638e2634877054644fe2c2a1ba6c985c5 - + https://github.com/dotnet/diagnostics - 5838149521e80185e0dbe79720bd9ce6e81d2d35 + afc42cb638e2634877054644fe2c2a1ba6c985c5 https://github.com/dotnet/command-line-api @@ -42,9 +42,9 @@ https://github.com/dotnet/arcade 60ae233c3d77f11c5fdb53e570b64d503b13ba59 - + https://github.com/dotnet/diagnostics - 5838149521e80185e0dbe79720bd9ce6e81d2d35 + afc42cb638e2634877054644fe2c2a1ba6c985c5 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 7d187c6bb2c..401f76a3534 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24324.3 - 8.0.0-preview.24408.1 - 8.0.0-preview.24408.1 + 8.0.0-preview.24413.1 + 8.0.0-preview.24413.1 9.0.0-preview.24405.1 @@ -67,7 +67,7 @@ 9.0.100-rc.1.24414.7 - 1.0.540801 + 1.0.541301 $(MicrosoftNETCoreApp31Version) From 397f07101b346f3f183840c29b8f825bb270c873 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 15 Aug 2024 14:20:58 +0000 Subject: [PATCH 353/568] Update dependencies from https://github.com/dotnet/diagnostics build 20240814.1 (#7161) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 00ac6f97ffc..58c126b0977 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore abbd67b97144c14ef60cdeb416ad9c5d75356c7f - + https://github.com/dotnet/diagnostics - afc42cb638e2634877054644fe2c2a1ba6c985c5 + 37f44c128570a592f87b76f6df435cdf8680630c - + https://github.com/dotnet/diagnostics - afc42cb638e2634877054644fe2c2a1ba6c985c5 + 37f44c128570a592f87b76f6df435cdf8680630c https://github.com/dotnet/command-line-api @@ -42,9 +42,9 @@ https://github.com/dotnet/arcade 60ae233c3d77f11c5fdb53e570b64d503b13ba59 - + https://github.com/dotnet/diagnostics - afc42cb638e2634877054644fe2c2a1ba6c985c5 + 37f44c128570a592f87b76f6df435cdf8680630c https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 401f76a3534..3da4549e6fe 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24324.3 - 8.0.0-preview.24413.1 - 8.0.0-preview.24413.1 + 8.0.0-preview.24414.1 + 8.0.0-preview.24414.1 9.0.0-preview.24405.1 @@ -67,7 +67,7 @@ 9.0.100-rc.1.24414.7 - 1.0.541301 + 1.0.541401 $(MicrosoftNETCoreApp31Version) From 6d65f9094918f92658662ce060414a885e6c70f3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 15 Aug 2024 14:23:48 +0000 Subject: [PATCH 354/568] Update dependencies from https://github.com/dotnet/arcade build 20240814.3 (#7162) [feature/9.x] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- global.json | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 58c126b0977..09ad57536cb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,25 +22,25 @@ https://github.com/dotnet/roslyn-analyzers 3211f48253bc18560156d90dc5e710d35f7d03fa - + https://github.com/dotnet/arcade - 60ae233c3d77f11c5fdb53e570b64d503b13ba59 + 4d15f8d1f2d61f6513b70f0bcd4bd3c1828a3a68 - + https://github.com/dotnet/arcade - 60ae233c3d77f11c5fdb53e570b64d503b13ba59 + 4d15f8d1f2d61f6513b70f0bcd4bd3c1828a3a68 - + https://github.com/dotnet/arcade - 60ae233c3d77f11c5fdb53e570b64d503b13ba59 + 4d15f8d1f2d61f6513b70f0bcd4bd3c1828a3a68 - + https://github.com/dotnet/arcade - 60ae233c3d77f11c5fdb53e570b64d503b13ba59 + 4d15f8d1f2d61f6513b70f0bcd4bd3c1828a3a68 - + https://github.com/dotnet/arcade - 60ae233c3d77f11c5fdb53e570b64d503b13ba59 + 4d15f8d1f2d61f6513b70f0bcd4bd3c1828a3a68 https://github.com/dotnet/diagnostics diff --git a/eng/Versions.props b/eng/Versions.props index 3da4549e6fe..3edd9252390 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,9 +48,9 @@ --> - 9.0.0-beta.24408.2 - 9.0.0-beta.24408.2 - 9.0.0-beta.24408.2 + 9.0.0-beta.24414.3 + 9.0.0-beta.24414.3 + 9.0.0-beta.24414.3 9.0.0-rc.1.24412.15 9.0.0-rc.1.24412.15 diff --git a/global.json b/global.json index b8d9171d6ef..84a31f4ed9a 100644 --- a/global.json +++ b/global.json @@ -31,7 +31,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24408.2", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24408.2" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24414.3", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24414.3" } } From 7d503225a774e9133344cc5d80d2b76da3727c53 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 16 Aug 2024 13:31:04 +0000 Subject: [PATCH 355/568] Update dependencies from https://github.com/dotnet/diagnostics build 20240815.1 (#7165) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 09ad57536cb..e47114f4df3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore abbd67b97144c14ef60cdeb416ad9c5d75356c7f - + https://github.com/dotnet/diagnostics - 37f44c128570a592f87b76f6df435cdf8680630c + b26e4c3dd97a5812d1aafbae79d588f4dd043aa2 - + https://github.com/dotnet/diagnostics - 37f44c128570a592f87b76f6df435cdf8680630c + b26e4c3dd97a5812d1aafbae79d588f4dd043aa2 https://github.com/dotnet/command-line-api @@ -42,9 +42,9 @@ https://github.com/dotnet/arcade 4d15f8d1f2d61f6513b70f0bcd4bd3c1828a3a68 - + https://github.com/dotnet/diagnostics - 37f44c128570a592f87b76f6df435cdf8680630c + b26e4c3dd97a5812d1aafbae79d588f4dd043aa2 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 3edd9252390..4aa3b27868b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24324.3 - 8.0.0-preview.24414.1 - 8.0.0-preview.24414.1 + 8.0.0-preview.24415.1 + 8.0.0-preview.24415.1 9.0.0-preview.24405.1 @@ -67,7 +67,7 @@ 9.0.100-rc.1.24414.7 - 1.0.541401 + 1.0.541501 $(MicrosoftNETCoreApp31Version) From 87cc19da51163f905cb7da18c9274fbd9fce681f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 17 Aug 2024 14:10:15 +0000 Subject: [PATCH 356/568] Update dependencies from https://github.com/dotnet/arcade build 20240816.2 (#7167) [feature/9.x] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- global.json | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e47114f4df3..104a52a7fb0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,25 +22,25 @@ https://github.com/dotnet/roslyn-analyzers 3211f48253bc18560156d90dc5e710d35f7d03fa - + https://github.com/dotnet/arcade - 4d15f8d1f2d61f6513b70f0bcd4bd3c1828a3a68 + 8fe02bab989df1265eee225df2c28af6dbdccc83 - + https://github.com/dotnet/arcade - 4d15f8d1f2d61f6513b70f0bcd4bd3c1828a3a68 + 8fe02bab989df1265eee225df2c28af6dbdccc83 - + https://github.com/dotnet/arcade - 4d15f8d1f2d61f6513b70f0bcd4bd3c1828a3a68 + 8fe02bab989df1265eee225df2c28af6dbdccc83 - + https://github.com/dotnet/arcade - 4d15f8d1f2d61f6513b70f0bcd4bd3c1828a3a68 + 8fe02bab989df1265eee225df2c28af6dbdccc83 - + https://github.com/dotnet/arcade - 4d15f8d1f2d61f6513b70f0bcd4bd3c1828a3a68 + 8fe02bab989df1265eee225df2c28af6dbdccc83 https://github.com/dotnet/diagnostics diff --git a/eng/Versions.props b/eng/Versions.props index 4aa3b27868b..800f694f562 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,9 +48,9 @@ --> - 9.0.0-beta.24414.3 - 9.0.0-beta.24414.3 - 9.0.0-beta.24414.3 + 9.0.0-beta.24416.2 + 9.0.0-beta.24416.2 + 9.0.0-beta.24416.2 9.0.0-rc.1.24412.15 9.0.0-rc.1.24412.15 diff --git a/global.json b/global.json index 84a31f4ed9a..18a3fa05110 100644 --- a/global.json +++ b/global.json @@ -31,7 +31,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24414.3", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24414.3" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24416.2", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24416.2" } } From aa1a2169648b500317a73dec4c5d36b720820d06 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 19 Aug 2024 09:56:00 -0700 Subject: [PATCH 357/568] Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20240815.1 (#7166) Microsoft.CodeAnalysis.NetAnalyzers From Version 9.0.0-preview.24405.1 -> To Version 9.0.0-preview.24415.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 104a52a7fb0..66eda7fcca8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -18,9 +18,9 @@ - + https://github.com/dotnet/roslyn-analyzers - 3211f48253bc18560156d90dc5e710d35f7d03fa + fdb9965ce68c1f4e1c0ff301488adf9caa958615 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 800f694f562..ce0cf73d881 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -60,7 +60,7 @@ 8.0.0-preview.24415.1 8.0.0-preview.24415.1 - 9.0.0-preview.24405.1 + 9.0.0-preview.24415.1 9.0.0-rc.1.24410.5 9.0.0-rc.1.24410.5 From a97e663543075301c0fdf0629df3470af55ffbc0 Mon Sep 17 00:00:00 2001 From: Justin Anderson Date: Mon, 19 Aug 2024 10:00:36 -0700 Subject: [PATCH 358/568] Update .NET SDK (#7153) --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index 18a3fa05110..b6a047e6bf9 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "9.0.100-preview.5.24307.3", + "dotnet": "9.0.100-preview.7.24407.12", "runtimes": { "aspnetcore": [ "$(MicrosoftAspNetCoreApp60Version)", From 1c58f4fca59f6934e6bba14b3f5c4091f5dde240 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 20 Aug 2024 09:01:01 -0700 Subject: [PATCH 359/568] [feature/9.x] Update dependencies from dotnet/diagnostics (#7172) * Update dependencies from https://github.com/dotnet/diagnostics build 20240816.1 Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe , Microsoft.FileFormats From Version 8.0.0-preview.24415.1 -> To Version 8.0.0-preview.24416.1 * Update dependencies from https://github.com/dotnet/diagnostics build 20240819.1 Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe , Microsoft.FileFormats From Version 8.0.0-preview.24416.1 -> To Version 8.0.0-preview.24419.1 --------- Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 66eda7fcca8..7e0506fa9e4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore abbd67b97144c14ef60cdeb416ad9c5d75356c7f - + https://github.com/dotnet/diagnostics - b26e4c3dd97a5812d1aafbae79d588f4dd043aa2 + 029a1b484852b24fe9dbe4dff394b890bd12b21b - + https://github.com/dotnet/diagnostics - b26e4c3dd97a5812d1aafbae79d588f4dd043aa2 + 029a1b484852b24fe9dbe4dff394b890bd12b21b https://github.com/dotnet/command-line-api @@ -42,9 +42,9 @@ https://github.com/dotnet/arcade 8fe02bab989df1265eee225df2c28af6dbdccc83 - + https://github.com/dotnet/diagnostics - b26e4c3dd97a5812d1aafbae79d588f4dd043aa2 + 029a1b484852b24fe9dbe4dff394b890bd12b21b https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index ce0cf73d881..0712eead23d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24324.3 - 8.0.0-preview.24415.1 - 8.0.0-preview.24415.1 + 8.0.0-preview.24419.1 + 8.0.0-preview.24419.1 9.0.0-preview.24415.1 @@ -67,7 +67,7 @@ 9.0.100-rc.1.24414.7 - 1.0.541501 + 1.0.541901 $(MicrosoftNETCoreApp31Version) From 6513f8948b803ae22225742d4924b09941c13b7a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 21 Aug 2024 09:56:57 -0700 Subject: [PATCH 360/568] Update dependencies from https://github.com/dotnet/diagnostics build 20240820.1 (#7177) Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe , Microsoft.FileFormats From Version 8.0.0-preview.24419.1 -> To Version 8.0.0-preview.24420.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7e0506fa9e4..bdf36bdda88 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore abbd67b97144c14ef60cdeb416ad9c5d75356c7f - + https://github.com/dotnet/diagnostics - 029a1b484852b24fe9dbe4dff394b890bd12b21b + c318910cd58495f3d2a22eeebad74e71e5d64bac - + https://github.com/dotnet/diagnostics - 029a1b484852b24fe9dbe4dff394b890bd12b21b + c318910cd58495f3d2a22eeebad74e71e5d64bac https://github.com/dotnet/command-line-api @@ -42,9 +42,9 @@ https://github.com/dotnet/arcade 8fe02bab989df1265eee225df2c28af6dbdccc83 - + https://github.com/dotnet/diagnostics - 029a1b484852b24fe9dbe4dff394b890bd12b21b + c318910cd58495f3d2a22eeebad74e71e5d64bac https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 0712eead23d..e3e4e70341d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24324.3 - 8.0.0-preview.24419.1 - 8.0.0-preview.24419.1 + 8.0.0-preview.24420.1 + 8.0.0-preview.24420.1 9.0.0-preview.24415.1 @@ -67,7 +67,7 @@ 9.0.100-rc.1.24414.7 - 1.0.541901 + 1.0.542001 $(MicrosoftNETCoreApp31Version) From e4a0d163ec2ddadb32408e56413b38b6856b1940 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 21 Aug 2024 09:57:21 -0700 Subject: [PATCH 361/568] Update dependencies from https://github.com/dotnet/arcade build 20240820.6 (#7178) Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.24416.2 -> To Version 9.0.0-beta.24420.6 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- global.json | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bdf36bdda88..a1c3afa9b0c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,25 +22,25 @@ https://github.com/dotnet/roslyn-analyzers fdb9965ce68c1f4e1c0ff301488adf9caa958615 - + https://github.com/dotnet/arcade - 8fe02bab989df1265eee225df2c28af6dbdccc83 + b435d26f349d3960d12281321972ed323c35319d - + https://github.com/dotnet/arcade - 8fe02bab989df1265eee225df2c28af6dbdccc83 + b435d26f349d3960d12281321972ed323c35319d - + https://github.com/dotnet/arcade - 8fe02bab989df1265eee225df2c28af6dbdccc83 + b435d26f349d3960d12281321972ed323c35319d - + https://github.com/dotnet/arcade - 8fe02bab989df1265eee225df2c28af6dbdccc83 + b435d26f349d3960d12281321972ed323c35319d - + https://github.com/dotnet/arcade - 8fe02bab989df1265eee225df2c28af6dbdccc83 + b435d26f349d3960d12281321972ed323c35319d https://github.com/dotnet/diagnostics diff --git a/eng/Versions.props b/eng/Versions.props index e3e4e70341d..f77ba6be08d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,9 +48,9 @@ --> - 9.0.0-beta.24416.2 - 9.0.0-beta.24416.2 - 9.0.0-beta.24416.2 + 9.0.0-beta.24420.6 + 9.0.0-beta.24420.6 + 9.0.0-beta.24420.6 9.0.0-rc.1.24412.15 9.0.0-rc.1.24412.15 diff --git a/global.json b/global.json index b6a047e6bf9..90e3a567c9e 100644 --- a/global.json +++ b/global.json @@ -31,7 +31,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24416.2", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24416.2" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24420.6", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24420.6" } } From 797bdbf9788fb2b9d6a9529c071764a336d5e7fc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 21 Aug 2024 19:45:14 +0000 Subject: [PATCH 362/568] Update dependencies from https://github.com/dotnet/arcade build 20240821.2 (#7179) [feature/9.x] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- eng/common/SetupNugetSources.ps1 | 2 +- eng/common/SetupNugetSources.sh | 2 +- global.json | 4 ++-- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a1c3afa9b0c..77f6f8018c8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,25 +22,25 @@ https://github.com/dotnet/roslyn-analyzers fdb9965ce68c1f4e1c0ff301488adf9caa958615 - + https://github.com/dotnet/arcade - b435d26f349d3960d12281321972ed323c35319d + 9b24668b7196b9639e60770465683cf81465d89a - + https://github.com/dotnet/arcade - b435d26f349d3960d12281321972ed323c35319d + 9b24668b7196b9639e60770465683cf81465d89a - + https://github.com/dotnet/arcade - b435d26f349d3960d12281321972ed323c35319d + 9b24668b7196b9639e60770465683cf81465d89a - + https://github.com/dotnet/arcade - b435d26f349d3960d12281321972ed323c35319d + 9b24668b7196b9639e60770465683cf81465d89a - + https://github.com/dotnet/arcade - b435d26f349d3960d12281321972ed323c35319d + 9b24668b7196b9639e60770465683cf81465d89a https://github.com/dotnet/diagnostics diff --git a/eng/Versions.props b/eng/Versions.props index f77ba6be08d..86bba7238e4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,9 +48,9 @@ --> - 9.0.0-beta.24420.6 - 9.0.0-beta.24420.6 - 9.0.0-beta.24420.6 + 9.0.0-beta.24421.2 + 9.0.0-beta.24421.2 + 9.0.0-beta.24421.2 9.0.0-rc.1.24412.15 9.0.0-rc.1.24412.15 diff --git a/eng/common/SetupNugetSources.ps1 b/eng/common/SetupNugetSources.ps1 index 2b0a5c9e665..5db4ad71ee2 100644 --- a/eng/common/SetupNugetSources.ps1 +++ b/eng/common/SetupNugetSources.ps1 @@ -157,7 +157,7 @@ if ($dotnet31Source -ne $null) { AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2" -Creds $creds -Username $userName -pwd $Password } -$dotnetVersions = @('5','6','7','8') +$dotnetVersions = @('5','6','7','8','9') foreach ($dotnetVersion in $dotnetVersions) { $feedPrefix = "dotnet" + $dotnetVersion; diff --git a/eng/common/SetupNugetSources.sh b/eng/common/SetupNugetSources.sh index b493479a1da..4604b61b032 100644 --- a/eng/common/SetupNugetSources.sh +++ b/eng/common/SetupNugetSources.sh @@ -99,7 +99,7 @@ if [ "$?" == "0" ]; then PackageSources+=('dotnet3.1-internal-transport') fi -DotNetVersions=('5' '6' '7' '8') +DotNetVersions=('5' '6' '7' '8' '9') for DotNetVersion in ${DotNetVersions[@]} ; do FeedPrefix="dotnet${DotNetVersion}"; diff --git a/global.json b/global.json index 90e3a567c9e..48ee82b34f5 100644 --- a/global.json +++ b/global.json @@ -31,7 +31,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24420.6", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24420.6" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24421.2", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24421.2" } } From 19177c0943a6605664940170710649c99fcf43da Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 22 Aug 2024 14:10:03 +0000 Subject: [PATCH 363/568] Update dependencies from https://github.com/dotnet/diagnostics build 20240821.1 (#7182) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 77f6f8018c8..69e67161ed2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore abbd67b97144c14ef60cdeb416ad9c5d75356c7f - + https://github.com/dotnet/diagnostics - c318910cd58495f3d2a22eeebad74e71e5d64bac + 0295d2d30184ddce3589ad43f50b26007de55a50 - + https://github.com/dotnet/diagnostics - c318910cd58495f3d2a22eeebad74e71e5d64bac + 0295d2d30184ddce3589ad43f50b26007de55a50 https://github.com/dotnet/command-line-api @@ -42,9 +42,9 @@ https://github.com/dotnet/arcade 9b24668b7196b9639e60770465683cf81465d89a - + https://github.com/dotnet/diagnostics - c318910cd58495f3d2a22eeebad74e71e5d64bac + 0295d2d30184ddce3589ad43f50b26007de55a50 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 86bba7238e4..dc211a28420 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24324.3 - 8.0.0-preview.24420.1 - 8.0.0-preview.24420.1 + 8.0.0-preview.24421.1 + 8.0.0-preview.24421.1 9.0.0-preview.24415.1 @@ -67,7 +67,7 @@ 9.0.100-rc.1.24414.7 - 1.0.542001 + 1.0.542101 $(MicrosoftNETCoreApp31Version) From d593bf32de7d3dbfb1241183d7764993440a1cd5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 22 Aug 2024 14:12:08 +0000 Subject: [PATCH 364/568] Update dependencies from https://github.com/dotnet/arcade build 20240821.7 (#7183) [feature/9.x] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- global.json | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 69e67161ed2..48441233bc7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,25 +22,25 @@ https://github.com/dotnet/roslyn-analyzers fdb9965ce68c1f4e1c0ff301488adf9caa958615 - + https://github.com/dotnet/arcade - 9b24668b7196b9639e60770465683cf81465d89a + c28c6307d0600513219bcd9ab028c0fedbe591ec - + https://github.com/dotnet/arcade - 9b24668b7196b9639e60770465683cf81465d89a + c28c6307d0600513219bcd9ab028c0fedbe591ec - + https://github.com/dotnet/arcade - 9b24668b7196b9639e60770465683cf81465d89a + c28c6307d0600513219bcd9ab028c0fedbe591ec - + https://github.com/dotnet/arcade - 9b24668b7196b9639e60770465683cf81465d89a + c28c6307d0600513219bcd9ab028c0fedbe591ec - + https://github.com/dotnet/arcade - 9b24668b7196b9639e60770465683cf81465d89a + c28c6307d0600513219bcd9ab028c0fedbe591ec https://github.com/dotnet/diagnostics diff --git a/eng/Versions.props b/eng/Versions.props index dc211a28420..afc104fd3c3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,9 +48,9 @@ --> - 9.0.0-beta.24421.2 - 9.0.0-beta.24421.2 - 9.0.0-beta.24421.2 + 9.0.0-beta.24421.7 + 9.0.0-beta.24421.7 + 9.0.0-beta.24421.7 9.0.0-rc.1.24412.15 9.0.0-rc.1.24412.15 diff --git a/global.json b/global.json index 48ee82b34f5..b6f41b73364 100644 --- a/global.json +++ b/global.json @@ -31,7 +31,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24421.2", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24421.2" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24421.7", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24421.7" } } From 473a73b9aa22bdb65e71ae124c5511f481bb73d9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 23 Aug 2024 13:34:29 +0000 Subject: [PATCH 365/568] Update dependencies from https://github.com/dotnet/diagnostics build 20240822.1 (#7190) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 48441233bc7..542c07f33f3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore abbd67b97144c14ef60cdeb416ad9c5d75356c7f - + https://github.com/dotnet/diagnostics - 0295d2d30184ddce3589ad43f50b26007de55a50 + 10da8eb2dbb32077a234e2aa2287e3cc92e9b8ad - + https://github.com/dotnet/diagnostics - 0295d2d30184ddce3589ad43f50b26007de55a50 + 10da8eb2dbb32077a234e2aa2287e3cc92e9b8ad https://github.com/dotnet/command-line-api @@ -42,9 +42,9 @@ https://github.com/dotnet/arcade c28c6307d0600513219bcd9ab028c0fedbe591ec - + https://github.com/dotnet/diagnostics - 0295d2d30184ddce3589ad43f50b26007de55a50 + 10da8eb2dbb32077a234e2aa2287e3cc92e9b8ad https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index afc104fd3c3..075bdd467f1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24324.3 - 8.0.0-preview.24421.1 - 8.0.0-preview.24421.1 + 8.0.0-preview.24422.1 + 8.0.0-preview.24422.1 9.0.0-preview.24415.1 @@ -67,7 +67,7 @@ 9.0.100-rc.1.24414.7 - 1.0.542101 + 1.0.542201 $(MicrosoftNETCoreApp31Version) From 83d6fbe1b96998fcc6cb3ec4c24cc7cb8e2d3b14 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 23 Aug 2024 15:06:41 -0700 Subject: [PATCH 366/568] [feature/9.x] Update dependencies from dotnet/sdk (#7163) * Update dependencies from https://github.com/dotnet/sdk build 20240815.1 VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0 From Version 9.0.100-rc.1.24414.7 -> To Version 9.0.100-rc.1.24415.1 Dependency coherency updates Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.NetCore.SharedFramework.x64.9.0 From Version 9.0.0-rc.1.24410.5 -> To Version 9.0.0-rc.1.24413.14 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0 * Update dependencies from https://github.com/dotnet/sdk build 20240817.9 VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0 From Version 9.0.100-rc.1.24415.1 -> To Version 9.0.100-rc.1.24417.9 Dependency coherency updates Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.NetCore.SharedFramework.x64.9.0 From Version 9.0.0-rc.1.24413.14 -> To Version 9.0.0-rc.1.24414.5 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0 * Update dependencies from https://github.com/dotnet/sdk build 20240819.12 VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0 From Version 9.0.100-rc.1.24417.9 -> To Version 9.0.100-rc.1.24419.12 Dependency coherency updates Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0 From Version 9.0.0-rc.1.24412.15 -> To Version 9.0.0-rc.1.24414.4 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0 * Update dependencies from https://github.com/dotnet/sdk build 20240820.1 VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0 From Version 9.0.100-rc.1.24419.12 -> To Version 9.0.100-rc.2.24420.1 Dependency coherency updates Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0 From Version 9.0.0-rc.1.24414.4 -> To Version 9.0.0-rc.1.24412.15 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0 * Update dependencies from https://github.com/dotnet/sdk build 20240820.21 VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0 From Version 9.0.100-rc.2.24420.1 -> To Version 9.0.100-rc.2.24420.21 * Update dependencies from https://github.com/dotnet/sdk build 20240822.24 VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0 From Version 9.0.100-rc.2.24420.21 -> To Version 9.0.100-rc.2.24422.24 Dependency coherency updates Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0 From Version 9.0.0-rc.1.24412.15 -> To Version 9.0.0-rc.2.24420.12 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0 --------- Co-authored-by: dotnet-maestro[bot] Co-authored-by: Justin Anderson --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 542c07f33f3..9fe4e2ef2c1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/aspnetcore - abbd67b97144c14ef60cdeb416ad9c5d75356c7f + 36332c8183f0205ec098822545dbe65d17d93405 https://github.com/dotnet/diagnostics @@ -46,21 +46,21 @@ https://github.com/dotnet/diagnostics 10da8eb2dbb32077a234e2aa2287e3cc92e9b8ad - + https://github.com/dotnet/runtime - 7cb32e193a55a95c74fc3bd56501b951b48b700f + 7384dc4b40071052d38fef092cefca9f66d3df65 - + https://github.com/dotnet/aspnetcore - abbd67b97144c14ef60cdeb416ad9c5d75356c7f + 36332c8183f0205ec098822545dbe65d17d93405 - + https://github.com/dotnet/sdk - 71a23de93f019d931579f230c30e95cdcb2f3480 + 4b123a7034c25bbabca8b0a0c229ceff487b5272 - + https://github.com/dotnet/runtime - 7cb32e193a55a95c74fc3bd56501b951b48b700f + 7384dc4b40071052d38fef092cefca9f66d3df65 diff --git a/eng/Versions.props b/eng/Versions.props index 075bdd467f1..296a842408c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,8 +52,8 @@ 9.0.0-beta.24421.7 9.0.0-beta.24421.7 - 9.0.0-rc.1.24412.15 - 9.0.0-rc.1.24412.15 + 9.0.0-rc.2.24420.12 + 9.0.0-rc.2.24420.12 2.0.0-beta4.24324.3 @@ -62,10 +62,10 @@ 9.0.0-preview.24415.1 - 9.0.0-rc.1.24410.5 - 9.0.0-rc.1.24410.5 + 9.0.0-rc.2.24422.6 + 9.0.0-rc.2.24422.6 - 9.0.100-rc.1.24414.7 + 9.0.100-rc.2.24422.24 1.0.542201 From 6898bc91ab432eec0602cc4376d87931a8ad853f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 24 Aug 2024 13:44:12 +0000 Subject: [PATCH 367/568] Update dependencies from https://github.com/dotnet/arcade build 20240823.2 (#7195) [feature/9.x] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 ++--- eng/Versions.props | 6 +- eng/common/core-templates/job/job.yml | 5 -- eng/common/internal/Tools.csproj | 1 + eng/common/templates-official/job/job.yml | 14 ++++ eng/common/templates/job/job.yml | 96 +++++++++++------------ global.json | 4 +- 7 files changed, 74 insertions(+), 72 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9fe4e2ef2c1..867e50481f7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,25 +22,25 @@ https://github.com/dotnet/roslyn-analyzers fdb9965ce68c1f4e1c0ff301488adf9caa958615 - + https://github.com/dotnet/arcade - c28c6307d0600513219bcd9ab028c0fedbe591ec + 91599268652b51969b8d8088d4f2f2ba7b3ebb19 - + https://github.com/dotnet/arcade - c28c6307d0600513219bcd9ab028c0fedbe591ec + 91599268652b51969b8d8088d4f2f2ba7b3ebb19 - + https://github.com/dotnet/arcade - c28c6307d0600513219bcd9ab028c0fedbe591ec + 91599268652b51969b8d8088d4f2f2ba7b3ebb19 - + https://github.com/dotnet/arcade - c28c6307d0600513219bcd9ab028c0fedbe591ec + 91599268652b51969b8d8088d4f2f2ba7b3ebb19 - + https://github.com/dotnet/arcade - c28c6307d0600513219bcd9ab028c0fedbe591ec + 91599268652b51969b8d8088d4f2f2ba7b3ebb19 https://github.com/dotnet/diagnostics diff --git a/eng/Versions.props b/eng/Versions.props index 296a842408c..293e2798bf7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,9 +48,9 @@ --> - 9.0.0-beta.24421.7 - 9.0.0-beta.24421.7 - 9.0.0-beta.24421.7 + 9.0.0-beta.24423.2 + 9.0.0-beta.24423.2 + 9.0.0-beta.24423.2 9.0.0-rc.2.24420.12 9.0.0-rc.2.24420.12 diff --git a/eng/common/core-templates/job/job.yml b/eng/common/core-templates/job/job.yml index c732bee9f4a..ba53ebfbd51 100644 --- a/eng/common/core-templates/job/job.yml +++ b/eng/common/core-templates/job/job.yml @@ -33,11 +33,6 @@ parameters: artifactPublishSteps: [] runAsPublic: false -# Sbom related params - enableSbom: true - PackageVersion: 9.0.0 - BuildDropPath: '$(Build.SourcesDirectory)/artifacts' - # 1es specific parameters is1ESPipeline: '' diff --git a/eng/common/internal/Tools.csproj b/eng/common/internal/Tools.csproj index e925952d566..32f79dfb340 100644 --- a/eng/common/internal/Tools.csproj +++ b/eng/common/internal/Tools.csproj @@ -4,6 +4,7 @@ net472 false + false diff --git a/eng/common/templates-official/job/job.yml b/eng/common/templates-official/job/job.yml index 0c2928d5c79..3d16b41c78c 100644 --- a/eng/common/templates-official/job/job.yml +++ b/eng/common/templates-official/job/job.yml @@ -1,8 +1,22 @@ +parameters: +# Sbom related params + enableSbom: true + PackageVersion: 9.0.0 + BuildDropPath: '$(Build.SourcesDirectory)/artifacts' + jobs: - template: /eng/common/core-templates/job/job.yml parameters: is1ESPipeline: true + componentGovernanceSteps: + - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.enableSbom, 'true')) }}: + - template: /eng/common/templates/steps/generate-sbom.yml + parameters: + PackageVersion: ${{ parameters.packageVersion }} + BuildDropPath: ${{ parameters.buildDropPath }} + publishArtifacts: false + # publish artifacts # for 1ES managed templates, use the templateContext.output to handle multiple outputs. templateContext: diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index 8da477dd69f..07d317bf8f9 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -19,71 +19,63 @@ jobs: steps: - ${{ each step in parameters.steps }}: - ${{ step }} - + componentGovernanceSteps: - - template: /eng/common/templates/steps/component-governance.yml - parameters: - ${{ if eq(parameters.disableComponentGovernance, '') }}: - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.runAsPublic, 'false'), or(startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/dotnet/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/microsoft/'), eq(variables['Build.SourceBranch'], 'refs/heads/main'))) }}: - disableComponentGovernance: false - ${{ else }}: - disableComponentGovernance: true + - template: /eng/common/templates/steps/component-governance.yml + parameters: + ${{ if eq(parameters.disableComponentGovernance, '') }}: + ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.runAsPublic, 'false'), or(startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/dotnet/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/microsoft/'), eq(variables['Build.SourceBranch'], 'refs/heads/main'))) }}: + disableComponentGovernance: false ${{ else }}: - disableComponentGovernance: ${{ parameters.disableComponentGovernance }} - componentGovernanceIgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }} - - - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.enableSbom, 'true')) }}: - - template: /eng/common/templates/steps/generate-sbom.yml - parameters: - PackageVersion: ${{ parameters.packageVersion }} - BuildDropPath: ${{ parameters.buildDropPath }} - publishArtifacts: false - + disableComponentGovernance: true + ${{ else }}: + disableComponentGovernance: ${{ parameters.disableComponentGovernance }} + componentGovernanceIgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }} artifactPublishSteps: - - ${{ if ne(parameters.artifacts.publish, '') }}: - - ${{ if and(ne(parameters.artifacts.publish.artifacts, 'false'), ne(parameters.artifacts.publish.artifacts, '')) }}: - - template: /eng/common/core-templates/steps/publish-build-artifacts.yml - parameters: - is1ESPipeline: false - args: - displayName: Publish pipeline artifacts - pathToPublish: '$(Build.ArtifactStagingDirectory)/artifacts' - publishLocation: Container - artifactName: ${{ coalesce(parameters.artifacts.publish.artifacts.name , 'Artifacts_$(Agent.Os)_$(_BuildConfig)') }} - continueOnError: true - condition: always() - - ${{ if and(ne(parameters.artifacts.publish.logs, 'false'), ne(parameters.artifacts.publish.logs, '')) }}: - - template: /eng/common/core-templates/steps/publish-pipeline-artifacts.yml - parameters: - is1ESPipeline: false - args: - targetPath: '$(Build.ArtifactStagingDirectory)/artifacts/log' - artifactName: ${{ coalesce(parameters.artifacts.publish.logs.name, 'Logs_Build_$(Agent.Os)_$(_BuildConfig)') }} - displayName: 'Publish logs' - continueOnError: true - condition: always() - sbomEnabled: false # we don't need SBOM for logs - - - ${{ if ne(parameters.enablePublishBuildArtifacts, 'false') }}: + - ${{ if ne(parameters.artifacts.publish, '') }}: + - ${{ if and(ne(parameters.artifacts.publish.artifacts, 'false'), ne(parameters.artifacts.publish.artifacts, '')) }}: - template: /eng/common/core-templates/steps/publish-build-artifacts.yml parameters: is1ESPipeline: false args: - displayName: Publish Logs - pathToPublish: '$(Build.ArtifactStagingDirectory)/artifacts/log/$(_BuildConfig)' + displayName: Publish pipeline artifacts + pathToPublish: '$(Build.ArtifactStagingDirectory)/artifacts' publishLocation: Container - artifactName: ${{ coalesce(parameters.enablePublishBuildArtifacts.artifactName, '$(Agent.Os)_$(Agent.JobName)' ) }} + artifactName: ${{ coalesce(parameters.artifacts.publish.artifacts.name , 'Artifacts_$(Agent.Os)_$(_BuildConfig)') }} continueOnError: true condition: always() - - - ${{ if eq(parameters.enableBuildRetry, 'true') }}: + - ${{ if and(ne(parameters.artifacts.publish.logs, 'false'), ne(parameters.artifacts.publish.logs, '')) }}: - template: /eng/common/core-templates/steps/publish-pipeline-artifacts.yml parameters: is1ESPipeline: false args: - targetPath: '$(Build.SourcesDirectory)\eng\common\BuildConfiguration' - artifactName: 'BuildConfiguration' - displayName: 'Publish build retry configuration' + targetPath: '$(Build.ArtifactStagingDirectory)/artifacts/log' + artifactName: ${{ coalesce(parameters.artifacts.publish.logs.name, 'Logs_Build_$(Agent.Os)_$(_BuildConfig)') }} + displayName: 'Publish logs' continueOnError: true - sbomEnabled: false # we don't need SBOM for BuildConfiguration + condition: always() + sbomEnabled: false # we don't need SBOM for logs + + - ${{ if ne(parameters.enablePublishBuildArtifacts, 'false') }}: + - template: /eng/common/core-templates/steps/publish-build-artifacts.yml + parameters: + is1ESPipeline: false + args: + displayName: Publish Logs + pathToPublish: '$(Build.ArtifactStagingDirectory)/artifacts/log/$(_BuildConfig)' + publishLocation: Container + artifactName: ${{ coalesce(parameters.enablePublishBuildArtifacts.artifactName, '$(Agent.Os)_$(Agent.JobName)' ) }} + continueOnError: true + condition: always() + + - ${{ if eq(parameters.enableBuildRetry, 'true') }}: + - template: /eng/common/core-templates/steps/publish-pipeline-artifacts.yml + parameters: + is1ESPipeline: false + args: + targetPath: '$(Build.SourcesDirectory)\eng\common\BuildConfiguration' + artifactName: 'BuildConfiguration' + displayName: 'Publish build retry configuration' + continueOnError: true + sbomEnabled: false # we don't need SBOM for BuildConfiguration diff --git a/global.json b/global.json index b6f41b73364..5820cb81fc0 100644 --- a/global.json +++ b/global.json @@ -31,7 +31,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24421.7", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24421.7" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24423.2", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24423.2" } } From 2b0f610f2b4ee1b3afa59c973f5b1db9688a5e3b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 24 Aug 2024 13:53:16 +0000 Subject: [PATCH 368/568] Update dependencies from https://github.com/dotnet/sdk build 20240823.15 (#7196) [feature/9.x] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Runtime.win-x64: from 9.0.0-rc.2.24420.12 to 9.0.0-rc.2.24422.3 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) - VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0: from 9.0.0-rc.2.24420.12 to 9.0.0-rc.2.24422.3 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 867e50481f7..6025ef0590e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/aspnetcore - 36332c8183f0205ec098822545dbe65d17d93405 + d11493ff125bffff4cb0db74dd62c8dc87c936d6 https://github.com/dotnet/diagnostics @@ -50,13 +50,13 @@ https://github.com/dotnet/runtime 7384dc4b40071052d38fef092cefca9f66d3df65 - + https://github.com/dotnet/aspnetcore - 36332c8183f0205ec098822545dbe65d17d93405 + d11493ff125bffff4cb0db74dd62c8dc87c936d6 - + https://github.com/dotnet/sdk - 4b123a7034c25bbabca8b0a0c229ceff487b5272 + 6bf8f98ca5c349293bdbd8d76c6b5744335f8693 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 293e2798bf7..1ca27df3f05 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,8 +52,8 @@ 9.0.0-beta.24423.2 9.0.0-beta.24423.2 - 9.0.0-rc.2.24420.12 - 9.0.0-rc.2.24420.12 + 9.0.0-rc.2.24422.3 + 9.0.0-rc.2.24422.3 2.0.0-beta4.24324.3 @@ -65,7 +65,7 @@ 9.0.0-rc.2.24422.6 9.0.0-rc.2.24422.6 - 9.0.100-rc.2.24422.24 + 9.0.100-rc.2.24423.15 1.0.542201 From 7f199a7f718e9b1fe7f133cdbb0c56e16c3591c2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 26 Aug 2024 13:15:55 +0000 Subject: [PATCH 369/568] Update dependencies from https://github.com/dotnet/diagnostics build 20240823.1 (#7203) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6025ef0590e..c8210e8683c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore d11493ff125bffff4cb0db74dd62c8dc87c936d6 - + https://github.com/dotnet/diagnostics - 10da8eb2dbb32077a234e2aa2287e3cc92e9b8ad + 46e15e6de2fb498e5931ae0c73f1df82e885975c - + https://github.com/dotnet/diagnostics - 10da8eb2dbb32077a234e2aa2287e3cc92e9b8ad + 46e15e6de2fb498e5931ae0c73f1df82e885975c https://github.com/dotnet/command-line-api @@ -42,9 +42,9 @@ https://github.com/dotnet/arcade 91599268652b51969b8d8088d4f2f2ba7b3ebb19 - + https://github.com/dotnet/diagnostics - 10da8eb2dbb32077a234e2aa2287e3cc92e9b8ad + 46e15e6de2fb498e5931ae0c73f1df82e885975c https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 1ca27df3f05..b0636c12a5d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24324.3 - 8.0.0-preview.24422.1 - 8.0.0-preview.24422.1 + 8.0.0-preview.24423.1 + 8.0.0-preview.24423.1 9.0.0-preview.24415.1 @@ -67,7 +67,7 @@ 9.0.100-rc.2.24423.15 - 1.0.542201 + 1.0.542301 $(MicrosoftNETCoreApp31Version) From fbe253531111c1cd48ffdf762dc90aab3e6622bf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 26 Aug 2024 13:21:41 +0000 Subject: [PATCH 370/568] Update dependencies from https://github.com/dotnet/sdk build 20240826.2 (#7204) [feature/9.x] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NETCore.App.Runtime.win-x64: from 9.0.0-rc.2.24422.6 to 9.0.0-rc.2.24423.10 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) - VS.Redist.Common.NetCore.SharedFramework.x64.9.0: from 9.0.0-rc.2.24422.6 to 9.0.0-rc.2.24423.10 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c8210e8683c..f0d5db5921f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -46,21 +46,21 @@ https://github.com/dotnet/diagnostics 46e15e6de2fb498e5931ae0c73f1df82e885975c - + https://github.com/dotnet/runtime - 7384dc4b40071052d38fef092cefca9f66d3df65 + 6f23d04dc2b2039e9eaf97bee2ac02a77ce56b21 https://github.com/dotnet/aspnetcore d11493ff125bffff4cb0db74dd62c8dc87c936d6 - + https://github.com/dotnet/sdk - 6bf8f98ca5c349293bdbd8d76c6b5744335f8693 + 5642787dacdcdf13356bd569124394dc93604b79 - + https://github.com/dotnet/runtime - 7384dc4b40071052d38fef092cefca9f66d3df65 + 6f23d04dc2b2039e9eaf97bee2ac02a77ce56b21 diff --git a/eng/Versions.props b/eng/Versions.props index b0636c12a5d..78f26c9a123 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -62,10 +62,10 @@ 9.0.0-preview.24415.1 - 9.0.0-rc.2.24422.6 - 9.0.0-rc.2.24422.6 + 9.0.0-rc.2.24423.10 + 9.0.0-rc.2.24423.10 - 9.0.100-rc.2.24423.15 + 9.0.100-rc.2.24426.2 1.0.542301 From 87978a2e2687e8fd408335a48be76abd0d56dc0b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 27 Aug 2024 14:18:54 +0000 Subject: [PATCH 371/568] Update dependencies from https://github.com/dotnet/diagnostics build 20240826.1 (#7213) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f0d5db5921f..af4ceaea2c5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore d11493ff125bffff4cb0db74dd62c8dc87c936d6 - + https://github.com/dotnet/diagnostics - 46e15e6de2fb498e5931ae0c73f1df82e885975c + d68fc19ea0c834747305f4eb0e961bbdb85366ff - + https://github.com/dotnet/diagnostics - 46e15e6de2fb498e5931ae0c73f1df82e885975c + d68fc19ea0c834747305f4eb0e961bbdb85366ff https://github.com/dotnet/command-line-api @@ -42,9 +42,9 @@ https://github.com/dotnet/arcade 91599268652b51969b8d8088d4f2f2ba7b3ebb19 - + https://github.com/dotnet/diagnostics - 46e15e6de2fb498e5931ae0c73f1df82e885975c + d68fc19ea0c834747305f4eb0e961bbdb85366ff https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 78f26c9a123..918751e8603 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24324.3 - 8.0.0-preview.24423.1 - 8.0.0-preview.24423.1 + 8.0.0-preview.24426.1 + 8.0.0-preview.24426.1 9.0.0-preview.24415.1 @@ -67,7 +67,7 @@ 9.0.100-rc.2.24426.2 - 1.0.542301 + 1.0.542601 $(MicrosoftNETCoreApp31Version) From 70c891ef77958e47764fff916f577094d98becb2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 27 Aug 2024 14:20:18 +0000 Subject: [PATCH 372/568] Update dependencies from https://github.com/dotnet/arcade build 20240826.3 (#7214) [feature/9.x] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- global.json | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index af4ceaea2c5..2f4da24670b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,25 +22,25 @@ https://github.com/dotnet/roslyn-analyzers fdb9965ce68c1f4e1c0ff301488adf9caa958615 - + https://github.com/dotnet/arcade - 91599268652b51969b8d8088d4f2f2ba7b3ebb19 + e3bdd9a0f2a65fe037ba1adb2261eea48a840fa4 - + https://github.com/dotnet/arcade - 91599268652b51969b8d8088d4f2f2ba7b3ebb19 + e3bdd9a0f2a65fe037ba1adb2261eea48a840fa4 - + https://github.com/dotnet/arcade - 91599268652b51969b8d8088d4f2f2ba7b3ebb19 + e3bdd9a0f2a65fe037ba1adb2261eea48a840fa4 - + https://github.com/dotnet/arcade - 91599268652b51969b8d8088d4f2f2ba7b3ebb19 + e3bdd9a0f2a65fe037ba1adb2261eea48a840fa4 - + https://github.com/dotnet/arcade - 91599268652b51969b8d8088d4f2f2ba7b3ebb19 + e3bdd9a0f2a65fe037ba1adb2261eea48a840fa4 https://github.com/dotnet/diagnostics diff --git a/eng/Versions.props b/eng/Versions.props index 918751e8603..d4b2dc3c25c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,9 +48,9 @@ --> - 9.0.0-beta.24423.2 - 9.0.0-beta.24423.2 - 9.0.0-beta.24423.2 + 9.0.0-beta.24426.3 + 9.0.0-beta.24426.3 + 9.0.0-beta.24426.3 9.0.0-rc.2.24422.3 9.0.0-rc.2.24422.3 diff --git a/global.json b/global.json index 5820cb81fc0..66cfaaea79f 100644 --- a/global.json +++ b/global.json @@ -31,7 +31,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24423.2", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24423.2" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24426.3", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24426.3" } } From 6f8e918433055773e39660decd3fc42cbc8aeaec Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 27 Aug 2024 14:23:35 +0000 Subject: [PATCH 373/568] Update dependencies from https://github.com/dotnet/sdk build 20240826.11 (#7215) [feature/9.x] Update dependencies from dotnet/sdk --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2f4da24670b..ab102538e39 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,9 +54,9 @@ https://github.com/dotnet/aspnetcore d11493ff125bffff4cb0db74dd62c8dc87c936d6 - + https://github.com/dotnet/sdk - 5642787dacdcdf13356bd569124394dc93604b79 + a9ebd73da1c3d4a1913f085cf9e9148ef670472c https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index d4b2dc3c25c..516b56e2733 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,7 +65,7 @@ 9.0.0-rc.2.24423.10 9.0.0-rc.2.24423.10 - 9.0.100-rc.2.24426.2 + 9.0.100-rc.2.24426.11 1.0.542601 From fa74c4a8a44a029be682811a1ff99f36cfa0fcff Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 28 Aug 2024 23:42:29 +0000 Subject: [PATCH 374/568] Update dependencies from https://github.com/dotnet/diagnostics build 20240827.4 (#7218) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ab102538e39..dfceaec6857 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore d11493ff125bffff4cb0db74dd62c8dc87c936d6 - + https://github.com/dotnet/diagnostics - d68fc19ea0c834747305f4eb0e961bbdb85366ff + 14e21788fb5764ecf586abe0fa0633418c6f255b - + https://github.com/dotnet/diagnostics - d68fc19ea0c834747305f4eb0e961bbdb85366ff + 14e21788fb5764ecf586abe0fa0633418c6f255b https://github.com/dotnet/command-line-api @@ -42,9 +42,9 @@ https://github.com/dotnet/arcade e3bdd9a0f2a65fe037ba1adb2261eea48a840fa4 - + https://github.com/dotnet/diagnostics - d68fc19ea0c834747305f4eb0e961bbdb85366ff + 14e21788fb5764ecf586abe0fa0633418c6f255b https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 516b56e2733..c61093ac192 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24324.3 - 8.0.0-preview.24426.1 - 8.0.0-preview.24426.1 + 8.0.0-preview.24427.4 + 8.0.0-preview.24427.4 9.0.0-preview.24415.1 @@ -67,7 +67,7 @@ 9.0.100-rc.2.24426.11 - 1.0.542601 + 1.0.542704 $(MicrosoftNETCoreApp31Version) From 9a9edeca7b691a7d085314ab15f7bb04a3f7e768 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 28 Aug 2024 23:45:11 +0000 Subject: [PATCH 375/568] Update dependencies from https://github.com/dotnet/sdk build 20240827.16 (#7220) [feature/9.x] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Runtime.win-x64: from 9.0.0-rc.2.24422.3 to 9.0.0-rc.2.24426.2 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) - Microsoft.NETCore.App.Runtime.win-x64: from 9.0.0-rc.2.24423.10 to 9.0.0-rc.2.24426.3 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) - VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0: from 9.0.0-rc.2.24422.3 to 9.0.0-rc.2.24426.2 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) - VS.Redist.Common.NetCore.SharedFramework.x64.9.0: from 9.0.0-rc.2.24423.10 to 9.0.0-rc.2.24426.3 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dfceaec6857..c06259b57fb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/aspnetcore - d11493ff125bffff4cb0db74dd62c8dc87c936d6 + 9f52b5ccf32f2171881ac6419851bac9cc0f34e4 https://github.com/dotnet/diagnostics @@ -46,21 +46,21 @@ https://github.com/dotnet/diagnostics 14e21788fb5764ecf586abe0fa0633418c6f255b - + https://github.com/dotnet/runtime - 6f23d04dc2b2039e9eaf97bee2ac02a77ce56b21 + fc775d2cb27fe6c3fb2461f72a284306063aa2d1 - + https://github.com/dotnet/aspnetcore - d11493ff125bffff4cb0db74dd62c8dc87c936d6 + 9f52b5ccf32f2171881ac6419851bac9cc0f34e4 - + https://github.com/dotnet/sdk - a9ebd73da1c3d4a1913f085cf9e9148ef670472c + 6821c0d1400083342a34d77c37223138bdfd455d - + https://github.com/dotnet/runtime - 6f23d04dc2b2039e9eaf97bee2ac02a77ce56b21 + fc775d2cb27fe6c3fb2461f72a284306063aa2d1 diff --git a/eng/Versions.props b/eng/Versions.props index c61093ac192..3783a2168c4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,8 +52,8 @@ 9.0.0-beta.24426.3 9.0.0-beta.24426.3 - 9.0.0-rc.2.24422.3 - 9.0.0-rc.2.24422.3 + 9.0.0-rc.2.24426.2 + 9.0.0-rc.2.24426.2 2.0.0-beta4.24324.3 @@ -62,10 +62,10 @@ 9.0.0-preview.24415.1 - 9.0.0-rc.2.24423.10 - 9.0.0-rc.2.24423.10 + 9.0.0-rc.2.24426.3 + 9.0.0-rc.2.24426.3 - 9.0.100-rc.2.24426.11 + 9.0.100-rc.2.24427.16 1.0.542704 From f8f3a9da26458a2f7a76c80ecf62e440b9074f87 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 29 Aug 2024 00:00:56 +0000 Subject: [PATCH 376/568] Restore branch-specific files --- .../templates/steps/telemetry-start.yml | 241 ------------------ 1 file changed, 241 deletions(-) delete mode 100644 eng/common/templates/steps/telemetry-start.yml diff --git a/eng/common/templates/steps/telemetry-start.yml b/eng/common/templates/steps/telemetry-start.yml deleted file mode 100644 index 6abbcb33a67..00000000000 --- a/eng/common/templates/steps/telemetry-start.yml +++ /dev/null @@ -1,241 +0,0 @@ -parameters: - helixSource: 'undefined_defaulted_in_telemetry.yml' - helixType: 'undefined_defaulted_in_telemetry.yml' - buildConfig: '' - runAsPublic: false - maxRetries: 5 - retryDelay: 10 # in seconds - -steps: -- ${{ if and(eq(parameters.runAsPublic, 'false'), not(eq(variables['System.TeamProject'], 'public'))) }}: - - task: AzureKeyVault@2 - inputs: - azureSubscription: 'HelixProd_KeyVault' - KeyVaultName: HelixProdKV - SecretsFilter: 'HelixApiAccessToken' - condition: always() -- bash: | - # create a temporary file - jobInfo=`mktemp` - - # write job info content to temporary file - cat > $jobInfo < Date: Thu, 29 Aug 2024 05:03:37 +0000 Subject: [PATCH 377/568] Update release information (#7225) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 3783a2168c4..3ed5d1e7069 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -5,7 +5,7 @@ https://github.com/dotnet/dotnet-monitor 9.0.0 rc - 1 + 2 true - 9.0.0-beta.24426.3 - 9.0.0-beta.24426.3 - 9.0.0-beta.24426.3 + 9.0.0-beta.24429.3 + 9.0.0-beta.24429.3 + 9.0.0-beta.24429.3 9.0.0-rc.2.24426.2 9.0.0-rc.2.24426.2 diff --git a/global.json b/global.json index 66cfaaea79f..4424f468d87 100644 --- a/global.json +++ b/global.json @@ -31,7 +31,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24426.3", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24426.3" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24429.3", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24429.3" } } From e77f94e77260db7aefdb32f9988f389f8c5b2c7c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 30 Aug 2024 15:18:28 -0700 Subject: [PATCH 379/568] [feature/9.x] Update dependencies from dotnet/diagnostics (#7227) * Update dependencies from https://github.com/dotnet/diagnostics build 20240828.1 Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe , Microsoft.FileFormats From Version 8.0.0-preview.24427.4 -> To Version 8.0.0-preview.24428.1 * Update dependencies from https://github.com/dotnet/diagnostics build 20240829.1 Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe , Microsoft.FileFormats From Version 8.0.0-preview.24428.1 -> To Version 8.0.0-preview.24429.1 --------- Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1ec83900dba..cda3618cda2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore 9f52b5ccf32f2171881ac6419851bac9cc0f34e4 - + https://github.com/dotnet/diagnostics - 14e21788fb5764ecf586abe0fa0633418c6f255b + c0da3bd6655901b56022532865c8be4481ac374e - + https://github.com/dotnet/diagnostics - 14e21788fb5764ecf586abe0fa0633418c6f255b + c0da3bd6655901b56022532865c8be4481ac374e https://github.com/dotnet/command-line-api @@ -42,9 +42,9 @@ https://github.com/dotnet/arcade b3f0996b03bfab02a8d9e1669ddb6f12b35634a5 - + https://github.com/dotnet/diagnostics - 14e21788fb5764ecf586abe0fa0633418c6f255b + c0da3bd6655901b56022532865c8be4481ac374e https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index ba2c5bed9ea..189c583ee6f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24324.3 - 8.0.0-preview.24427.4 - 8.0.0-preview.24427.4 + 8.0.0-preview.24429.1 + 8.0.0-preview.24429.1 9.0.0-preview.24415.1 @@ -67,7 +67,7 @@ 9.0.100-rc.2.24427.16 - 1.0.542704 + 1.0.542901 $(MicrosoftNETCoreApp31Version) From 37262dd6b80a12c95ea4263828e3f2a2629f4178 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 30 Aug 2024 15:19:11 -0700 Subject: [PATCH 380/568] [feature/9.x] Update dependencies from dotnet/sdk (#7228) * Update dependencies from https://github.com/dotnet/sdk build 20240828.9 VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0 From Version 9.0.100-rc.2.24427.16 -> To Version 9.0.100-rc.2.24428.9 Dependency coherency updates Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.NetCore.SharedFramework.x64.9.0 From Version 9.0.0-rc.2.24426.3 -> To Version 9.0.0-rc.2.24427.10 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0 * Update dependencies from https://github.com/dotnet/sdk build 20240830.10 VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0 From Version 9.0.100-rc.2.24428.9 -> To Version 9.0.100-rc.2.24430.10 Dependency coherency updates Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.NetCore.SharedFramework.x64.9.0 From Version 9.0.0-rc.2.24427.10 -> To Version 9.0.0-rc.2.24428.8 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0 --------- Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cda3618cda2..69b3f9a5dc9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -46,21 +46,21 @@ https://github.com/dotnet/diagnostics c0da3bd6655901b56022532865c8be4481ac374e - + https://github.com/dotnet/runtime - fc775d2cb27fe6c3fb2461f72a284306063aa2d1 + 0a5cccb57942c0493ef680f559f69866f3b1eb7d https://github.com/dotnet/aspnetcore 9f52b5ccf32f2171881ac6419851bac9cc0f34e4 - + https://github.com/dotnet/sdk - 6821c0d1400083342a34d77c37223138bdfd455d + 4b4d9f442ff91fd58f86f1ed39ca1abe93a8c6b8 - + https://github.com/dotnet/runtime - fc775d2cb27fe6c3fb2461f72a284306063aa2d1 + 0a5cccb57942c0493ef680f559f69866f3b1eb7d diff --git a/eng/Versions.props b/eng/Versions.props index 189c583ee6f..6f80fd5cf4b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -62,10 +62,10 @@ 9.0.0-preview.24415.1 - 9.0.0-rc.2.24426.3 - 9.0.0-rc.2.24426.3 + 9.0.0-rc.2.24428.8 + 9.0.0-rc.2.24428.8 - 9.0.100-rc.2.24427.16 + 9.0.100-rc.2.24430.10 1.0.542901 From 193533eedf27e0532c556817b828363bec0e0110 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 31 Aug 2024 13:48:15 +0000 Subject: [PATCH 381/568] Update dependencies from https://github.com/dotnet/arcade build 20240829.5 (#7245) [feature/9.x] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- global.json | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 69b3f9a5dc9..785cb709bae 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,25 +22,25 @@ https://github.com/dotnet/roslyn-analyzers fdb9965ce68c1f4e1c0ff301488adf9caa958615 - + https://github.com/dotnet/arcade - b3f0996b03bfab02a8d9e1669ddb6f12b35634a5 + d21db44e84b9038ea7b2add139adee2303d46800 - + https://github.com/dotnet/arcade - b3f0996b03bfab02a8d9e1669ddb6f12b35634a5 + d21db44e84b9038ea7b2add139adee2303d46800 - + https://github.com/dotnet/arcade - b3f0996b03bfab02a8d9e1669ddb6f12b35634a5 + d21db44e84b9038ea7b2add139adee2303d46800 - + https://github.com/dotnet/arcade - b3f0996b03bfab02a8d9e1669ddb6f12b35634a5 + d21db44e84b9038ea7b2add139adee2303d46800 - + https://github.com/dotnet/arcade - b3f0996b03bfab02a8d9e1669ddb6f12b35634a5 + d21db44e84b9038ea7b2add139adee2303d46800 https://github.com/dotnet/diagnostics diff --git a/eng/Versions.props b/eng/Versions.props index 6f80fd5cf4b..8e69082219c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,9 +48,9 @@ --> - 9.0.0-beta.24429.3 - 9.0.0-beta.24429.3 - 9.0.0-beta.24429.3 + 9.0.0-beta.24429.5 + 9.0.0-beta.24429.5 + 9.0.0-beta.24429.5 9.0.0-rc.2.24426.2 9.0.0-rc.2.24426.2 diff --git a/global.json b/global.json index 4424f468d87..7cf7a3b57e9 100644 --- a/global.json +++ b/global.json @@ -31,7 +31,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24429.3", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24429.3" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24429.5", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24429.5" } } From 381197ed8971b73ccbd86f9ec89e20142ccad31e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 2 Sep 2024 00:08:42 +0000 Subject: [PATCH 382/568] Restore branch-specific files --- .../steps/get-delegation-sas.yml | 32 +++---------------- 1 file changed, 5 insertions(+), 27 deletions(-) diff --git a/eng/common/templates-official/steps/get-delegation-sas.yml b/eng/common/templates-official/steps/get-delegation-sas.yml index 2c3f7474790..c5a9c1f8275 100644 --- a/eng/common/templates-official/steps/get-delegation-sas.yml +++ b/eng/common/templates-official/steps/get-delegation-sas.yml @@ -1,29 +1,7 @@ steps: -- task: AzureCLI@2 - displayName: 'Generate delegation SAS Token for ${{ parameters.storageAccount }}/${{ parameters.container }}' - inputs: - azureSubscription: ${{ parameters.federatedServiceConnection }} - scriptType: 'pscore' - scriptLocation: 'inlineScript' - inlineScript: | - # Temporarily work around a helix issue where SAS tokens with / in them will cause incorrect downloads - # of correlation payloads. See https://github.com/dotnet/dnceng/issues/3484 - $sas = "" - do { - # Calculate the expiration of the SAS token and convert to UTC - $expiry = (Get-Date).AddHours(${{ parameters.expiryInHours }}).ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ssZ") +- template: /eng/common/core-templates/steps/get-delegation-sas.yml + parameters: + is1ESPipeline: true - $sas = az storage container generate-sas --account-name ${{ parameters.storageAccount }} --name ${{ parameters.container }} --permissions ${{ parameters.permissions }} --expiry $expiry --auth-mode login --as-user -o tsv - - if ($LASTEXITCODE -ne 0) { - Write-Error "Failed to generate SAS token." - exit 1 - } - } while($sas.IndexOf('/') -ne -1) - - if ('${{ parameters.base64Encode }}' -eq 'true') { - $sas = [Convert]::ToBase64String([System.Text.Encoding]::UTF8.GetBytes($sas)) - } - - Write-Host "Setting '${{ parameters.outputVariableName }}' with the access token value" - Write-Host "##vso[task.setvariable variable=${{ parameters.outputVariableName }};issecret=true]$sas" + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} From 75c4f9cd97199f34bdec5c85449a8a735ef6cc2f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 2 Sep 2024 13:48:39 +0000 Subject: [PATCH 383/568] Update dependencies from https://github.com/dotnet/diagnostics build 20240830.1 (#7249) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 785cb709bae..6d0c9145cf5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore 9f52b5ccf32f2171881ac6419851bac9cc0f34e4 - + https://github.com/dotnet/diagnostics - c0da3bd6655901b56022532865c8be4481ac374e + 82c898e3a59d3c88601cd083e294b93cd737c495 - + https://github.com/dotnet/diagnostics - c0da3bd6655901b56022532865c8be4481ac374e + 82c898e3a59d3c88601cd083e294b93cd737c495 https://github.com/dotnet/command-line-api @@ -42,9 +42,9 @@ https://github.com/dotnet/arcade d21db44e84b9038ea7b2add139adee2303d46800 - + https://github.com/dotnet/diagnostics - c0da3bd6655901b56022532865c8be4481ac374e + 82c898e3a59d3c88601cd083e294b93cd737c495 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 8e69082219c..f14a006dcd7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24324.3 - 8.0.0-preview.24429.1 - 8.0.0-preview.24429.1 + 8.0.0-preview.24430.1 + 8.0.0-preview.24430.1 9.0.0-preview.24415.1 @@ -67,7 +67,7 @@ 9.0.100-rc.2.24430.10 - 1.0.542901 + 1.0.543001 $(MicrosoftNETCoreApp31Version) From 725715753ea7c89fd9a21f109dda7d976df5af43 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 2 Sep 2024 13:49:15 +0000 Subject: [PATCH 384/568] Update dependencies from https://github.com/dotnet/sdk build 20240902.3 (#7250) [feature/9.x] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Runtime.win-x64: from 9.0.0-rc.2.24426.2 to 9.0.0-rc.2.24430.8 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) - Microsoft.NETCore.App.Runtime.win-x64: from 9.0.0-rc.2.24428.8 to 9.0.0-rc.2.24429.19 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) - VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0: from 9.0.0-rc.2.24426.2 to 9.0.0-rc.2.24430.8 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) - VS.Redist.Common.NetCore.SharedFramework.x64.9.0: from 9.0.0-rc.2.24428.8 to 9.0.0-rc.2.24429.19 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6d0c9145cf5..1607ea8a16f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/aspnetcore - 9f52b5ccf32f2171881ac6419851bac9cc0f34e4 + 2b865e33f2c7c9484c28a3b62e8ff07966e23434 https://github.com/dotnet/diagnostics @@ -46,21 +46,21 @@ https://github.com/dotnet/diagnostics 82c898e3a59d3c88601cd083e294b93cd737c495 - + https://github.com/dotnet/runtime - 0a5cccb57942c0493ef680f559f69866f3b1eb7d + d0f3235d312f7cf9683012b3fe96b2c6f20a1743 - + https://github.com/dotnet/aspnetcore - 9f52b5ccf32f2171881ac6419851bac9cc0f34e4 + 2b865e33f2c7c9484c28a3b62e8ff07966e23434 - + https://github.com/dotnet/sdk - 4b4d9f442ff91fd58f86f1ed39ca1abe93a8c6b8 + c294e97a49ccda45531a555e74ad8f89ec16dc8a - + https://github.com/dotnet/runtime - 0a5cccb57942c0493ef680f559f69866f3b1eb7d + d0f3235d312f7cf9683012b3fe96b2c6f20a1743 diff --git a/eng/Versions.props b/eng/Versions.props index f14a006dcd7..fde87169a7d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,8 +52,8 @@ 9.0.0-beta.24429.5 9.0.0-beta.24429.5 - 9.0.0-rc.2.24426.2 - 9.0.0-rc.2.24426.2 + 9.0.0-rc.2.24430.8 + 9.0.0-rc.2.24430.8 2.0.0-beta4.24324.3 @@ -62,10 +62,10 @@ 9.0.0-preview.24415.1 - 9.0.0-rc.2.24428.8 - 9.0.0-rc.2.24428.8 + 9.0.0-rc.2.24429.19 + 9.0.0-rc.2.24429.19 - 9.0.100-rc.2.24430.10 + 9.0.100-rc.2.24452.3 1.0.543001 From 17d6aacef20127996bb7c18b782a0c220d4751ee Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 3 Sep 2024 17:00:34 +0000 Subject: [PATCH 385/568] Update dependencies from https://github.com/dotnet/sdk build 20240903.2 (#7254) [feature/9.x] Update dependencies from dotnet/sdk --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1607ea8a16f..51dedde193a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,9 +54,9 @@ https://github.com/dotnet/aspnetcore 2b865e33f2c7c9484c28a3b62e8ff07966e23434 - + https://github.com/dotnet/sdk - c294e97a49ccda45531a555e74ad8f89ec16dc8a + 398636fbe7c881cfaf3e29b3b4a27d2afbfd8733 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index fde87169a7d..91eba6fbc0f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,7 +65,7 @@ 9.0.0-rc.2.24429.19 9.0.0-rc.2.24429.19 - 9.0.100-rc.2.24452.3 + 9.0.100-rc.2.24453.2 1.0.543001 From d9a3b94e4ba3144ce805952ae84364cdfe42f5f5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 3 Sep 2024 17:09:28 +0000 Subject: [PATCH 386/568] Update dependencies from https://github.com/dotnet/diagnostics build 20240902.1 (#7253) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 51dedde193a..b42658d1d52 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore 2b865e33f2c7c9484c28a3b62e8ff07966e23434 - + https://github.com/dotnet/diagnostics - 82c898e3a59d3c88601cd083e294b93cd737c495 + 3c9d5f7244733b5087e64f28e331c7eb5eb8d9c6 - + https://github.com/dotnet/diagnostics - 82c898e3a59d3c88601cd083e294b93cd737c495 + 3c9d5f7244733b5087e64f28e331c7eb5eb8d9c6 https://github.com/dotnet/command-line-api @@ -42,9 +42,9 @@ https://github.com/dotnet/arcade d21db44e84b9038ea7b2add139adee2303d46800 - + https://github.com/dotnet/diagnostics - 82c898e3a59d3c88601cd083e294b93cd737c495 + 3c9d5f7244733b5087e64f28e331c7eb5eb8d9c6 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 91eba6fbc0f..87e6dc7e202 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24324.3 - 8.0.0-preview.24430.1 - 8.0.0-preview.24430.1 + 8.0.0-preview.24452.1 + 8.0.0-preview.24452.1 9.0.0-preview.24415.1 @@ -67,7 +67,7 @@ 9.0.100-rc.2.24453.2 - 1.0.543001 + 1.0.545201 $(MicrosoftNETCoreApp31Version) From a2751658bdb0e7dedd583df6e7af27f16584b6fb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 4 Sep 2024 14:27:02 +0000 Subject: [PATCH 387/568] Update dependencies from https://github.com/dotnet/diagnostics build 20240903.1 (#7257) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b42658d1d52..c95ae1a85d6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore 2b865e33f2c7c9484c28a3b62e8ff07966e23434 - + https://github.com/dotnet/diagnostics - 3c9d5f7244733b5087e64f28e331c7eb5eb8d9c6 + 73f3a28276252a4d6ff9783a46adca3fc05731a6 - + https://github.com/dotnet/diagnostics - 3c9d5f7244733b5087e64f28e331c7eb5eb8d9c6 + 73f3a28276252a4d6ff9783a46adca3fc05731a6 https://github.com/dotnet/command-line-api @@ -42,9 +42,9 @@ https://github.com/dotnet/arcade d21db44e84b9038ea7b2add139adee2303d46800 - + https://github.com/dotnet/diagnostics - 3c9d5f7244733b5087e64f28e331c7eb5eb8d9c6 + 73f3a28276252a4d6ff9783a46adca3fc05731a6 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 87e6dc7e202..e3c85846c0b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24324.3 - 8.0.0-preview.24452.1 - 8.0.0-preview.24452.1 + 8.0.0-preview.24453.1 + 8.0.0-preview.24453.1 9.0.0-preview.24415.1 @@ -67,7 +67,7 @@ 9.0.100-rc.2.24453.2 - 1.0.545201 + 1.0.545301 $(MicrosoftNETCoreApp31Version) From 3357c791e0ef28179d39e54ff55330934ff7294c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 4 Sep 2024 14:32:11 +0000 Subject: [PATCH 388/568] Update dependencies from https://github.com/dotnet/sdk build 20240903.35 (#7260) [feature/9.x] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Runtime.win-x64: from 9.0.0-rc.2.24430.8 to 9.0.0-rc.2.24453.1 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) - VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0: from 9.0.0-rc.2.24430.8 to 9.0.0-rc.2.24453.1 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c95ae1a85d6..c639ac69f89 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/aspnetcore - 2b865e33f2c7c9484c28a3b62e8ff07966e23434 + 36cdc65bf29bac3d7bd0c5d38242a92608fab7eb https://github.com/dotnet/diagnostics @@ -50,13 +50,13 @@ https://github.com/dotnet/runtime d0f3235d312f7cf9683012b3fe96b2c6f20a1743 - + https://github.com/dotnet/aspnetcore - 2b865e33f2c7c9484c28a3b62e8ff07966e23434 + 36cdc65bf29bac3d7bd0c5d38242a92608fab7eb - + https://github.com/dotnet/sdk - 398636fbe7c881cfaf3e29b3b4a27d2afbfd8733 + dde5de98e37845d768d9ca37920eb080e57f27ec https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index e3c85846c0b..9c84d8bc0f9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,8 +52,8 @@ 9.0.0-beta.24429.5 9.0.0-beta.24429.5 - 9.0.0-rc.2.24430.8 - 9.0.0-rc.2.24430.8 + 9.0.0-rc.2.24453.1 + 9.0.0-rc.2.24453.1 2.0.0-beta4.24324.3 @@ -65,7 +65,7 @@ 9.0.0-rc.2.24429.19 9.0.0-rc.2.24429.19 - 9.0.100-rc.2.24453.2 + 9.0.100-rc.2.24453.35 1.0.545301 From 7714763990582fd62cc8c13d9d790f502eea0bd1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 4 Sep 2024 14:34:10 +0000 Subject: [PATCH 389/568] Update dependencies from https://github.com/dotnet/arcade build 20240903.1 (#7258) [feature/9.x] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- global.json | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c639ac69f89..c98051cbb8f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,25 +22,25 @@ https://github.com/dotnet/roslyn-analyzers fdb9965ce68c1f4e1c0ff301488adf9caa958615 - + https://github.com/dotnet/arcade - d21db44e84b9038ea7b2add139adee2303d46800 + dd332f2d4e21daa8b79f84251ab156af9a0b11b2 - + https://github.com/dotnet/arcade - d21db44e84b9038ea7b2add139adee2303d46800 + dd332f2d4e21daa8b79f84251ab156af9a0b11b2 - + https://github.com/dotnet/arcade - d21db44e84b9038ea7b2add139adee2303d46800 + dd332f2d4e21daa8b79f84251ab156af9a0b11b2 - + https://github.com/dotnet/arcade - d21db44e84b9038ea7b2add139adee2303d46800 + dd332f2d4e21daa8b79f84251ab156af9a0b11b2 - + https://github.com/dotnet/arcade - d21db44e84b9038ea7b2add139adee2303d46800 + dd332f2d4e21daa8b79f84251ab156af9a0b11b2 https://github.com/dotnet/diagnostics diff --git a/eng/Versions.props b/eng/Versions.props index 9c84d8bc0f9..c94dbaa3856 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,9 +48,9 @@ --> - 9.0.0-beta.24429.5 - 9.0.0-beta.24429.5 - 9.0.0-beta.24429.5 + 9.0.0-beta.24453.1 + 9.0.0-beta.24453.1 + 9.0.0-beta.24453.1 9.0.0-rc.2.24453.1 9.0.0-rc.2.24453.1 diff --git a/global.json b/global.json index 7cf7a3b57e9..37d078d423f 100644 --- a/global.json +++ b/global.json @@ -31,7 +31,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24429.5", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24429.5" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24453.1", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24453.1" } } From f437be7d439f6ec64b279176c699e26fd346488e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 4 Sep 2024 09:15:10 -0700 Subject: [PATCH 390/568] Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20240829.1 (#7259) Microsoft.CodeAnalysis.NetAnalyzers From Version 9.0.0-preview.24415.1 -> To Version 9.0.0-preview.24429.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c98051cbb8f..cfd8d650fc8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -18,9 +18,9 @@ - + https://github.com/dotnet/roslyn-analyzers - fdb9965ce68c1f4e1c0ff301488adf9caa958615 + 7db866672807e652611c5654cca67f82e2b1c113 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index c94dbaa3856..36314e85dee 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -60,7 +60,7 @@ 8.0.0-preview.24453.1 8.0.0-preview.24453.1 - 9.0.0-preview.24415.1 + 9.0.0-preview.24429.1 9.0.0-rc.2.24429.19 9.0.0-rc.2.24429.19 From 7d4a8bd65e8cac0be16585275c25acbb414abd57 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 5 Sep 2024 13:41:55 +0000 Subject: [PATCH 391/568] Update dependencies from https://github.com/dotnet/sdk build 20240904.6 (#7269) [feature/9.x] Update dependencies from dotnet/sdk --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cfd8d650fc8..bb2ea25b1e2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,9 +54,9 @@ https://github.com/dotnet/aspnetcore 36cdc65bf29bac3d7bd0c5d38242a92608fab7eb - + https://github.com/dotnet/sdk - dde5de98e37845d768d9ca37920eb080e57f27ec + d3e74996c84078b0fb4bf74c03069f7cd696c3bb https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 36314e85dee..262dbdbff60 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,7 +65,7 @@ 9.0.0-rc.2.24429.19 9.0.0-rc.2.24429.19 - 9.0.100-rc.2.24453.35 + 9.0.100-rc.2.24454.6 1.0.545301 From 44e01a54e24380695e1db159af0bb9e45141f2a8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 5 Sep 2024 16:13:21 -0700 Subject: [PATCH 392/568] Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20240904.1 (#7268) Microsoft.CodeAnalysis.NetAnalyzers From Version 9.0.0-preview.24429.1 -> To Version 9.0.0-preview.24454.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bb2ea25b1e2..be9f68a7fb2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -18,9 +18,9 @@ - + https://github.com/dotnet/roslyn-analyzers - 7db866672807e652611c5654cca67f82e2b1c113 + a7c74cf887abe4a38240bc4ead0b221d9d42434f https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 262dbdbff60..7b4121744f8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -60,7 +60,7 @@ 8.0.0-preview.24453.1 8.0.0-preview.24453.1 - 9.0.0-preview.24429.1 + 9.0.0-preview.24454.1 9.0.0-rc.2.24429.19 9.0.0-rc.2.24429.19 From e2e3be2dedff8b18fdcc234243f41a42c5e4f987 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 6 Sep 2024 00:25:46 +0000 Subject: [PATCH 393/568] Update dependencies from https://github.com/dotnet/diagnostics build 20240904.1 (#7267) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index be9f68a7fb2..b7b05d206af 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore 36cdc65bf29bac3d7bd0c5d38242a92608fab7eb - + https://github.com/dotnet/diagnostics - 73f3a28276252a4d6ff9783a46adca3fc05731a6 + 3eb66d2099e2ae44ebae497ea9b447fcdfb356a9 - + https://github.com/dotnet/diagnostics - 73f3a28276252a4d6ff9783a46adca3fc05731a6 + 3eb66d2099e2ae44ebae497ea9b447fcdfb356a9 https://github.com/dotnet/command-line-api @@ -42,9 +42,9 @@ https://github.com/dotnet/arcade dd332f2d4e21daa8b79f84251ab156af9a0b11b2 - + https://github.com/dotnet/diagnostics - 73f3a28276252a4d6ff9783a46adca3fc05731a6 + 3eb66d2099e2ae44ebae497ea9b447fcdfb356a9 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 7b4121744f8..cb0e8c8a776 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24324.3 - 8.0.0-preview.24453.1 - 8.0.0-preview.24453.1 + 8.0.0-preview.24454.1 + 8.0.0-preview.24454.1 9.0.0-preview.24454.1 @@ -67,7 +67,7 @@ 9.0.100-rc.2.24454.6 - 1.0.545301 + 1.0.545401 $(MicrosoftNETCoreApp31Version) From 201003e7c129b1523e08a37f2959ca2d802127bb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 6 Sep 2024 13:47:59 +0000 Subject: [PATCH 394/568] Update dependencies from https://github.com/dotnet/sdk build 20240905.8 (#7274) [feature/9.x] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NETCore.App.Runtime.win-x64: from 9.0.0-rc.2.24429.19 to 9.0.0-rc.2.24454.7 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) - VS.Redist.Common.NetCore.SharedFramework.x64.9.0: from 9.0.0-rc.2.24429.19 to 9.0.0-rc.2.24454.7 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b7b05d206af..cb4b6aaba65 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -46,21 +46,21 @@ https://github.com/dotnet/diagnostics 3eb66d2099e2ae44ebae497ea9b447fcdfb356a9 - + https://github.com/dotnet/runtime - d0f3235d312f7cf9683012b3fe96b2c6f20a1743 + af1b39a3d8bb2221ab1021f20ba6f87ef9c5c9ef https://github.com/dotnet/aspnetcore 36cdc65bf29bac3d7bd0c5d38242a92608fab7eb - + https://github.com/dotnet/sdk - d3e74996c84078b0fb4bf74c03069f7cd696c3bb + 55704641bc0848ce3bc75e475039744e431d6f0e - + https://github.com/dotnet/runtime - d0f3235d312f7cf9683012b3fe96b2c6f20a1743 + af1b39a3d8bb2221ab1021f20ba6f87ef9c5c9ef diff --git a/eng/Versions.props b/eng/Versions.props index cb0e8c8a776..e9797dc49cc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -62,10 +62,10 @@ 9.0.0-preview.24454.1 - 9.0.0-rc.2.24429.19 - 9.0.0-rc.2.24429.19 + 9.0.0-rc.2.24454.7 + 9.0.0-rc.2.24454.7 - 9.0.100-rc.2.24454.6 + 9.0.100-rc.2.24455.8 1.0.545401 From 0795965f6bf3c93f64854e6a9e57157a2c3eb930 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 6 Sep 2024 20:34:47 +0000 Subject: [PATCH 395/568] Update dependencies from https://github.com/dotnet/diagnostics build 20240905.1 (#7273) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cb4b6aaba65..6046b51d7e8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore 36cdc65bf29bac3d7bd0c5d38242a92608fab7eb - + https://github.com/dotnet/diagnostics - 3eb66d2099e2ae44ebae497ea9b447fcdfb356a9 + 749110d2efa032710e5708dbffa008c1ad6e0c5e - + https://github.com/dotnet/diagnostics - 3eb66d2099e2ae44ebae497ea9b447fcdfb356a9 + 749110d2efa032710e5708dbffa008c1ad6e0c5e https://github.com/dotnet/command-line-api @@ -42,9 +42,9 @@ https://github.com/dotnet/arcade dd332f2d4e21daa8b79f84251ab156af9a0b11b2 - + https://github.com/dotnet/diagnostics - 3eb66d2099e2ae44ebae497ea9b447fcdfb356a9 + 749110d2efa032710e5708dbffa008c1ad6e0c5e https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index e9797dc49cc..0d31cba076d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24324.3 - 8.0.0-preview.24454.1 - 8.0.0-preview.24454.1 + 8.0.0-preview.24455.1 + 8.0.0-preview.24455.1 9.0.0-preview.24454.1 @@ -67,7 +67,7 @@ 9.0.100-rc.2.24455.8 - 1.0.545401 + 1.0.545501 $(MicrosoftNETCoreApp31Version) From 400478ab4b3f9da8bbe80a3ea86d88931f726937 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 7 Sep 2024 14:24:04 +0000 Subject: [PATCH 396/568] Update dependencies from https://github.com/dotnet/sdk build 20240906.5 (#7278) [feature/9.x] Update dependencies from dotnet/sdk --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6046b51d7e8..5915cfe74c3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,9 +54,9 @@ https://github.com/dotnet/aspnetcore 36cdc65bf29bac3d7bd0c5d38242a92608fab7eb - + https://github.com/dotnet/sdk - 55704641bc0848ce3bc75e475039744e431d6f0e + b7b40381db3e5f3117235867751603114c2b06d2 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 0d31cba076d..ee13c3cbce2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,7 +65,7 @@ 9.0.0-rc.2.24454.7 9.0.0-rc.2.24454.7 - 9.0.100-rc.2.24455.8 + 9.0.100-rc.2.24456.5 1.0.545501 From 85aff0b274557fdd6bb71d3d1e81c449ab803180 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 03:07:08 +0000 Subject: [PATCH 397/568] Update dependencies from https://github.com/dotnet/sdk build 20240907.1 (#7279) VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0 From Version 9.0.100-rc.2.24456.5 -> To Version 9.0.100-rc.2.24457.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5915cfe74c3..d4cf58fad6d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,9 +54,9 @@ https://github.com/dotnet/aspnetcore 36cdc65bf29bac3d7bd0c5d38242a92608fab7eb - + https://github.com/dotnet/sdk - b7b40381db3e5f3117235867751603114c2b06d2 + c80faea95ec961426f3ac3938d465e17fe418fe6 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index ee13c3cbce2..bf834b44473 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,7 +65,7 @@ 9.0.0-rc.2.24454.7 9.0.0-rc.2.24454.7 - 9.0.100-rc.2.24456.5 + 9.0.100-rc.2.24457.1 1.0.545501 From c3926fe68c2cb10f21e826a2316a33785bdf62e5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 14:14:12 +0000 Subject: [PATCH 398/568] Update dependencies from https://github.com/dotnet/diagnostics build 20240906.1 (#7286) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d4cf58fad6d..1e440c4934d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore 36cdc65bf29bac3d7bd0c5d38242a92608fab7eb - + https://github.com/dotnet/diagnostics - 749110d2efa032710e5708dbffa008c1ad6e0c5e + bfb8c3e9025f4e31409626925a2ecf5e17ca5157 - + https://github.com/dotnet/diagnostics - 749110d2efa032710e5708dbffa008c1ad6e0c5e + bfb8c3e9025f4e31409626925a2ecf5e17ca5157 https://github.com/dotnet/command-line-api @@ -42,9 +42,9 @@ https://github.com/dotnet/arcade dd332f2d4e21daa8b79f84251ab156af9a0b11b2 - + https://github.com/dotnet/diagnostics - 749110d2efa032710e5708dbffa008c1ad6e0c5e + bfb8c3e9025f4e31409626925a2ecf5e17ca5157 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index bf834b44473..667394eeb87 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24324.3 - 8.0.0-preview.24455.1 - 8.0.0-preview.24455.1 + 8.0.0-preview.24456.1 + 8.0.0-preview.24456.1 9.0.0-preview.24454.1 @@ -67,7 +67,7 @@ 9.0.100-rc.2.24457.1 - 1.0.545501 + 1.0.545601 $(MicrosoftNETCoreApp31Version) From c8f6443c57a78e781839d267728556b4da72f188 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 14:17:13 +0000 Subject: [PATCH 399/568] Update dependencies from https://github.com/dotnet/sdk build 20240909.3 (#7287) [feature/9.x] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Runtime.win-x64: from 9.0.0-rc.2.24453.1 to 9.0.0-rc.2.24455.6 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) - Microsoft.NETCore.App.Runtime.win-x64: from 9.0.0-rc.2.24454.7 to 9.0.0-rc.2.24456.9 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) - VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0: from 9.0.0-rc.2.24453.1 to 9.0.0-rc.2.24455.6 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) - VS.Redist.Common.NetCore.SharedFramework.x64.9.0: from 9.0.0-rc.2.24454.7 to 9.0.0-rc.2.24456.9 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1e440c4934d..dd99747623d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/aspnetcore - 36cdc65bf29bac3d7bd0c5d38242a92608fab7eb + 07da5601559ba66827c1b89ada58ff9d2ea676bc https://github.com/dotnet/diagnostics @@ -46,21 +46,21 @@ https://github.com/dotnet/diagnostics bfb8c3e9025f4e31409626925a2ecf5e17ca5157 - + https://github.com/dotnet/runtime - af1b39a3d8bb2221ab1021f20ba6f87ef9c5c9ef + dec716d1c4651b70e4710e781e832a64be1e713b - + https://github.com/dotnet/aspnetcore - 36cdc65bf29bac3d7bd0c5d38242a92608fab7eb + 07da5601559ba66827c1b89ada58ff9d2ea676bc - + https://github.com/dotnet/sdk - c80faea95ec961426f3ac3938d465e17fe418fe6 + dc8695276bd1ec6cc1f1b0cf3ae55875eda3ad14 - + https://github.com/dotnet/runtime - af1b39a3d8bb2221ab1021f20ba6f87ef9c5c9ef + dec716d1c4651b70e4710e781e832a64be1e713b diff --git a/eng/Versions.props b/eng/Versions.props index 667394eeb87..17a3e98d91e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,8 +52,8 @@ 9.0.0-beta.24453.1 9.0.0-beta.24453.1 - 9.0.0-rc.2.24453.1 - 9.0.0-rc.2.24453.1 + 9.0.0-rc.2.24455.6 + 9.0.0-rc.2.24455.6 2.0.0-beta4.24324.3 @@ -62,10 +62,10 @@ 9.0.0-preview.24454.1 - 9.0.0-rc.2.24454.7 - 9.0.0-rc.2.24454.7 + 9.0.0-rc.2.24456.9 + 9.0.0-rc.2.24456.9 - 9.0.100-rc.2.24457.1 + 9.0.100-rc.2.24459.3 1.0.545601 From 42fb463a4997f4edd2b9430eae170f84c67dedfd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 10 Sep 2024 13:54:44 +0000 Subject: [PATCH 400/568] Update dependencies from https://github.com/dotnet/diagnostics build 20240909.1 (#7297) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dd99747623d..57a172891b8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore 07da5601559ba66827c1b89ada58ff9d2ea676bc - + https://github.com/dotnet/diagnostics - bfb8c3e9025f4e31409626925a2ecf5e17ca5157 + f6ac55b86f797f1722fdc93aae13cb0c8eb8cdde - + https://github.com/dotnet/diagnostics - bfb8c3e9025f4e31409626925a2ecf5e17ca5157 + f6ac55b86f797f1722fdc93aae13cb0c8eb8cdde https://github.com/dotnet/command-line-api @@ -42,9 +42,9 @@ https://github.com/dotnet/arcade dd332f2d4e21daa8b79f84251ab156af9a0b11b2 - + https://github.com/dotnet/diagnostics - bfb8c3e9025f4e31409626925a2ecf5e17ca5157 + f6ac55b86f797f1722fdc93aae13cb0c8eb8cdde https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 17a3e98d91e..e6912bb40e2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24324.3 - 8.0.0-preview.24456.1 - 8.0.0-preview.24456.1 + 8.0.0-preview.24459.1 + 8.0.0-preview.24459.1 9.0.0-preview.24454.1 @@ -67,7 +67,7 @@ 9.0.100-rc.2.24459.3 - 1.0.545601 + 1.0.545901 $(MicrosoftNETCoreApp31Version) From a1ea64617b5e30c781e828a83da1018a733bbe40 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2024 10:15:13 -0700 Subject: [PATCH 401/568] [feature/9.x] Update dependencies from dotnet/sdk (#7300) * Update dependencies from https://github.com/dotnet/sdk build 20240910.1 VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0 From Version 9.0.100-rc.2.24459.3 -> To Version 9.0.100-rc.2.24460.1 * Update dependencies from https://github.com/dotnet/sdk build 20240911.5 VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0 From Version 9.0.100-rc.2.24460.1 -> To Version 9.0.100-rc.2.24461.5 Dependency coherency updates Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0 From Version 9.0.0-rc.2.24455.6 -> To Version 9.0.0-rc.2.24460.5 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0 --------- Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 57a172891b8..edf2813cfa5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/aspnetcore - 07da5601559ba66827c1b89ada58ff9d2ea676bc + fc4f8810d8df45a9f42e02f688041bf592c18138 https://github.com/dotnet/diagnostics @@ -46,21 +46,21 @@ https://github.com/dotnet/diagnostics f6ac55b86f797f1722fdc93aae13cb0c8eb8cdde - + https://github.com/dotnet/runtime - dec716d1c4651b70e4710e781e832a64be1e713b + d32b46121993f762367238e1fad834205dc9123c - + https://github.com/dotnet/aspnetcore - 07da5601559ba66827c1b89ada58ff9d2ea676bc + fc4f8810d8df45a9f42e02f688041bf592c18138 - + https://github.com/dotnet/sdk - dc8695276bd1ec6cc1f1b0cf3ae55875eda3ad14 + 78b2e7285e1e92a95e5a35ca41a554d8a0141519 - + https://github.com/dotnet/runtime - dec716d1c4651b70e4710e781e832a64be1e713b + d32b46121993f762367238e1fad834205dc9123c diff --git a/eng/Versions.props b/eng/Versions.props index e6912bb40e2..ff12febaed9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,8 +52,8 @@ 9.0.0-beta.24453.1 9.0.0-beta.24453.1 - 9.0.0-rc.2.24455.6 - 9.0.0-rc.2.24455.6 + 9.0.0-rc.2.24460.5 + 9.0.0-rc.2.24460.5 2.0.0-beta4.24324.3 @@ -62,10 +62,10 @@ 9.0.0-preview.24454.1 - 9.0.0-rc.2.24456.9 - 9.0.0-rc.2.24456.9 + 9.0.0-rc.2.24459.11 + 9.0.0-rc.2.24459.11 - 9.0.100-rc.2.24459.3 + 9.0.100-rc.2.24461.5 1.0.545901 From a25cf190b6126ab88a252fbe21a99737274143d8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2024 17:42:40 +0000 Subject: [PATCH 402/568] Update dependencies from https://github.com/dotnet/diagnostics build 20240910.1 (#7306) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index edf2813cfa5..3c642356862 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore fc4f8810d8df45a9f42e02f688041bf592c18138 - + https://github.com/dotnet/diagnostics - f6ac55b86f797f1722fdc93aae13cb0c8eb8cdde + a5c4167284a37e2bd48924bc832f1a17ee498e98 - + https://github.com/dotnet/diagnostics - f6ac55b86f797f1722fdc93aae13cb0c8eb8cdde + a5c4167284a37e2bd48924bc832f1a17ee498e98 https://github.com/dotnet/command-line-api @@ -42,9 +42,9 @@ https://github.com/dotnet/arcade dd332f2d4e21daa8b79f84251ab156af9a0b11b2 - + https://github.com/dotnet/diagnostics - f6ac55b86f797f1722fdc93aae13cb0c8eb8cdde + a5c4167284a37e2bd48924bc832f1a17ee498e98 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index ff12febaed9..67201a09b17 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24324.3 - 8.0.0-preview.24459.1 - 8.0.0-preview.24459.1 + 8.0.0-preview.24460.1 + 8.0.0-preview.24460.1 9.0.0-preview.24454.1 @@ -67,7 +67,7 @@ 9.0.100-rc.2.24461.5 - 1.0.545901 + 1.0.546001 $(MicrosoftNETCoreApp31Version) From 3648f9b2e04c70aa4ada56155944929f3f3f763e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2024 18:16:03 +0000 Subject: [PATCH 403/568] Update dependencies from https://github.com/dotnet/arcade build 20240909.6 (#7298) [feature/9.x] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- global.json | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3c642356862..3bddc2fd0ef 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,25 +22,25 @@ https://github.com/dotnet/roslyn-analyzers a7c74cf887abe4a38240bc4ead0b221d9d42434f - + https://github.com/dotnet/arcade - dd332f2d4e21daa8b79f84251ab156af9a0b11b2 + 65260b148c869ada772a5843863c54737cd2361e - + https://github.com/dotnet/arcade - dd332f2d4e21daa8b79f84251ab156af9a0b11b2 + 65260b148c869ada772a5843863c54737cd2361e - + https://github.com/dotnet/arcade - dd332f2d4e21daa8b79f84251ab156af9a0b11b2 + 65260b148c869ada772a5843863c54737cd2361e - + https://github.com/dotnet/arcade - dd332f2d4e21daa8b79f84251ab156af9a0b11b2 + 65260b148c869ada772a5843863c54737cd2361e - + https://github.com/dotnet/arcade - dd332f2d4e21daa8b79f84251ab156af9a0b11b2 + 65260b148c869ada772a5843863c54737cd2361e https://github.com/dotnet/diagnostics diff --git a/eng/Versions.props b/eng/Versions.props index 67201a09b17..0207d9c6ee8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,9 +48,9 @@ --> - 9.0.0-beta.24453.1 - 9.0.0-beta.24453.1 - 9.0.0-beta.24453.1 + 9.0.0-beta.24459.6 + 9.0.0-beta.24459.6 + 9.0.0-beta.24459.6 9.0.0-rc.2.24460.5 9.0.0-rc.2.24460.5 diff --git a/global.json b/global.json index 37d078d423f..69ad052c703 100644 --- a/global.json +++ b/global.json @@ -31,7 +31,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24453.1", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24453.1" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24459.6", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24459.6" } } From 62065ad805971dc3d4b40ff282a9add33e4fee15 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 12 Sep 2024 14:10:19 +0000 Subject: [PATCH 404/568] Update dependencies from https://github.com/dotnet/sdk build 20240912.6 (#7313) [feature/9.x] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Runtime.win-x64: from 9.0.0-rc.2.24460.5 to 9.0.0-rc.2.24461.26 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) - VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0: from 9.0.0-rc.2.24460.5 to 9.0.0-rc.2.24461.26 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3bddc2fd0ef..cf9e4db4bcc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/aspnetcore - fc4f8810d8df45a9f42e02f688041bf592c18138 + a961b93bca44f3013d526f4b879b550afabe2da0 https://github.com/dotnet/diagnostics @@ -50,13 +50,13 @@ https://github.com/dotnet/runtime d32b46121993f762367238e1fad834205dc9123c - + https://github.com/dotnet/aspnetcore - fc4f8810d8df45a9f42e02f688041bf592c18138 + a961b93bca44f3013d526f4b879b550afabe2da0 - + https://github.com/dotnet/sdk - 78b2e7285e1e92a95e5a35ca41a554d8a0141519 + 8128f3953717402d2b9b5d903f0f4558485ebd00 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 0207d9c6ee8..25d8015d4c3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,8 +52,8 @@ 9.0.0-beta.24459.6 9.0.0-beta.24459.6 - 9.0.0-rc.2.24460.5 - 9.0.0-rc.2.24460.5 + 9.0.0-rc.2.24461.26 + 9.0.0-rc.2.24461.26 2.0.0-beta4.24324.3 @@ -65,7 +65,7 @@ 9.0.0-rc.2.24459.11 9.0.0-rc.2.24459.11 - 9.0.100-rc.2.24461.5 + 9.0.100-rc.2.24462.6 1.0.546001 From dca89048fdf516bc395b5b45565267b3ba8aa027 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 12 Sep 2024 13:11:51 -0700 Subject: [PATCH 405/568] [feature/9.x] Sync branch with origin/main (#7308) * Update dependencies from https://github.com/dotnet/diagnostics build 20240906.1 (#7285) [main] Update dependencies from dotnet/diagnostics * Add Docker Compose sample and cross link (#7276) * Update public Linux build machines to Ubuntu 22.04 (#7283) * Update release tool to .NET 8 and update dependencies (#7284) * [main] Bump Swashbuckle.AspNetCore in /eng/dependabot/independent (#7288) Bumps [Swashbuckle.AspNetCore](https://github.com/domaindrivendev/Swashbuckle.AspNetCore) from 6.7.1 to 6.7.3. - [Release notes](https://github.com/domaindrivendev/Swashbuckle.AspNetCore/releases) - [Commits](https://github.com/domaindrivendev/Swashbuckle.AspNetCore/compare/v6.7.1...v6.7.3) --- updated-dependencies: - dependency-name: Swashbuckle.AspNetCore dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * generate release notes (#7294) * Update dependencies from https://github.com/dotnet/diagnostics build 20240909.1 (#7295) [main] Update dependencies from dotnet/diagnostics * Update dependencies from https://github.com/dotnet/arcade build 20240909.4 (#7296) [main] Update dependencies from dotnet/arcade * Prevent collected exceptions from being dropped due to null event values (#7301) * Register v9.0.0-rc.1.24453.3 release information (#7303) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update dependencies from https://github.com/dotnet/diagnostics build 20240910.1 (#7304) [main] Update dependencies from dotnet/diagnostics * Update dependencies from https://github.com/dotnet/arcade build 20240910.4 (#7305) [main] Update dependencies from dotnet/arcade * Restore branch-specific files --------- Signed-off-by: dependabot[bot] Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Justin Anderson Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Joe Schmitt <1146681+schmittjoseph@users.noreply.github.com> --- .github/releases.json | 6 +- documentation/README.md | 1 + documentation/docker-compose.md | 106 ++++++++++++++++++ documentation/docker.md | 5 + documentation/kubernetes.md | 2 + .../releaseNotes/releaseNotes.v9.0.0-rc.1.md | 7 ++ documentation/releases.md | 2 +- eng/dependabot/independent/Versions.props | 2 +- eng/pipelines/jobs/build.yml | 2 +- eng/pipelines/stages/preparerelease.yml | 4 +- .../DiagnosticsReleaseTool.csproj | 16 +-- .../Eventing/ExceptionsEventSource.cs | 4 +- .../Steps/ExceptionEventsPipelineStep.cs | 2 +- .../Exceptions/IExceptionInstance.cs | 2 +- .../Eventing/ExceptionsEventSourceTests.cs | 4 +- 15 files changed, 143 insertions(+), 22 deletions(-) create mode 100644 documentation/docker-compose.md create mode 100644 documentation/releaseNotes/releaseNotes.v9.0.0-rc.1.md diff --git a/.github/releases.json b/.github/releases.json index 45fefb64d19..56527bd3268 100644 --- a/.github/releases.json +++ b/.github/releases.json @@ -65,9 +65,9 @@ "outOfSupportDate": "2024-05-14T00:00:00.000Z" }, "9.0": { - "tag": "v9.0.0-preview.7.24408.4", - "minorReleaseDate": "2024-08-13T00:00:00.000Z", - "patchReleaseDate": "2024-08-13T00:00:00.000Z", + "tag": "v9.0.0-rc.1.24453.3", + "minorReleaseDate": "2024-09-10T00:00:00.000Z", + "patchReleaseDate": "2024-09-10T00:00:00.000Z", "supportedFrameworks": [ "net9.0" ] diff --git a/documentation/README.md b/documentation/README.md index c56dc5d4e1b..30848283be0 100644 --- a/documentation/README.md +++ b/documentation/README.md @@ -11,6 +11,7 @@ When running a dotnet application, differences in diverse local and production e - Getting Started - [Running on a local machine](./localmachine.md) - [Running in Docker](./docker.md) + - [Running in Docker Compose](./docker-compose.md) - [Running in Kubernetes](./kubernetes.md) - [API Endpoints](./api/README.md) - [OpenAPI document](./openapi.md) diff --git a/documentation/docker-compose.md b/documentation/docker-compose.md new file mode 100644 index 00000000000..88706c44c36 --- /dev/null +++ b/documentation/docker-compose.md @@ -0,0 +1,106 @@ +# Running in Docker Compose + +In addition to its availability as a .NET CLI tool, the `dotnet monitor` tool is available as a prebuilt Docker image that can be run in container runtimes and orchestrators, such as Docker Compose. + +For Dockerfiles and repository information, see [Running in Docker](./docker.md) + +For a Kubernetes sample, see [Running in Kubernetes](./kubernetes.md) + +## Non-root considerations + +Starting with .NET 8.0, both the sample ASP.NET application and dotnet-monitor run as non-root. If both the application and dotnet-monitor are 8+, no additional configuration is required. Otherwise, a [user](https://docs.docker.com/reference/compose-file/services/#user) configuration may need to be added to the application, dotnet-monitor, or both. + +## Example Deployment + +The following examples demonstrate a deployment of the dotnet-monitor container image monitoring an application container as services. + +
+ .NET Monitor 8+ + +```yaml +# Tell us about your experience using dotnet monitor: https://aka.ms/dotnet-monitor-survey +services: + app: + image: mcr.microsoft.com/dotnet/samples:aspnetapp-chiseled + ports: + - "8080:8080" + environment: + - DOTNET_DiagnosticPorts=/diag/dotnet-monitor.sock + volumes: + - diagvol:/diag + deploy: + resources: + limits: + cpus: '0.250' + memory: 512M + + monitor: + image: mcr.microsoft.com/dotnet/monitor:8 + # DO NOT use the --no-auth argument for deployments in production; this argument is used for demonstration + # purposes only in this example. Please continue reading after this example for further details. + command: ["collect", "--no-auth"] + ports: + - "52323:52323" + - "52325:52325" + environment: + - DOTNETMONITOR_DiagnosticPort__ConnectionMode=Listen + - DOTNETMONITOR_Storage__DefaultSharedPath=/diag + # ALWAYS use the HTTPS form of the URL for deployments in production; the removal of HTTPS is done for + # demonstration purposes only in this example. Please continue reading after this example for further details. + - DOTNETMONITOR_Urls=http://+:52323 + # The metrics URL is set in the CMD instruction of the image by default. However, this deployment overrides that with the args setting; manually set the URL to the same value using configuration. + - DOTNETMONITOR_Metrics__Endpoints=http://+:52325 + # The image will output logging in a json format by default, which is great for ingestion by tools such as Azure Monitor Log Analytics. + # Switch the logging format to simple for this sample for easier reading. + - Logging__Console__FormatterName=simple + volumes: + - diagvol:/diag + deploy: + resources: + reservations: + cpus: '0.050' + memory: 50M + limits: + cpus: '0.250' + memory: 256M + +volumes: + diagvol: + driver_opts: + type: tmpfs + device: tmpfs +``` +
+ +## Example Details + +* __Listen Mode__: The `dotnet monitor` tool is configured to run in `listen` mode. The tool establishes a diagnostic communication channel at the specified Unix Domain Socket path by the `DOTNETMONITOR_DiagnosticPort__EndpointName` environment variable. The application container has a `DOTNET_DiagnosticPorts` environment variable specified so that the application's runtime will communicate with the `dotnet monitor` instance at the specified Unix Domain Socket path. The application runtime will be suspended (e.g. no managed code execution) until it establishes communication with `dotnet monitor`. Application startup time will depend on how long it takes for the `dotnet monitor` container to run, but this should be quick. +> **7.0+**: Setting `DOTNETMONITOR_DiagnosticPort__EndpointName` is not necessary if (1) `DOTNETMONITOR_Storage__DefaultSharedPath` is set and (2) `DOTNETMONITOR_DiagnosticPort__ConnectionMode` is set to `Listen`; the combination of these settings automatically creates a Unix Domain Socket named `dotnet-monitor.sock` under the default shared path. The `DOTNETMONITOR_DiagnosticPort__EndpointName` setting is still available to use if the default behavior needs to be overridden. +* __Multiple Application Containers__: The `dotnet monitor` tool is capable of monitoring multiple processes at the same time. When running in `listen` mode, each of the applications can connect to the same communication channel path in order to allow `dotnet monitor` to observe them. +* __Dumps Temporary Folder__: The `dotnet monitor` tool is configured to instruct the application runtime to produce dump files at the path specified by the `DOTNETMONITOR_Storage__DumpTempFolder` environment variable. Without specifying this variable, the application runtime will create dump files in the `/tmp` directory of its container, which is not accessible by the `dotnet monitor` container in this example. +> **7.0+**: Setting `DOTNETMONITOR_Storage__DumpTempFolder` is not necessary if `DOTNETMONITOR_Storage__DefaultSharedPath` is set; dumps will be produced in a subfolder under the specified shared path. The `DOTNETMONITOR_Storage__DumpTempFolder` setting is still available to use if the default behavior needs to be overridden. +* __Disabled Authentication__: By default, the `dotnet monitor` tool requires authentication for any of the URLs specified by the `--urls` command line parameter or configured via the `ASPNETCORE_Urls`/`DOTNETMONITOR_Urls` environment variables (see [Authentication](./authentication.md) for further details). For the purposes of this example, authentication has been disabled by using the `--no-auth` command line switch. __Use of this command line switch is NOT recommended for production scenarios__ as it would allow anything with access to the URLs to be able to capture dumps, traces, etc (which may contain sensitive information, such as keys) of any process that `dotnet monitor` is able to monitor. +* __Disabled HTTPS__: By default, the `dotnet monitor` tool has HTTPS enabled on the default artifact URLs, which are configured to be `https://+:52323` in the Docker image. For the purposes of this example, the artifact URLs have been changed to `http://localhost:52323` using the `DOTNETMONITOR_Urls` environment variable such that a TLS certificate is not required. __Disabling HTTPS is NOT recommended for production scenarios.__ +* __Command Line Arguments__: Starting in 7.0, the default command line arguments for the `dotnet monitor` tool have been moved to the CMD instruction of the Docker image (previously, they were part of the ENTRYPOINT instruction). If the arguments of the image are overridden, then the default arguments must be explicitly specified in the overridden setting or set via configuration. See [7.0 Compatibility](compatibility/7.0/README.md#docker-container-entrypoint-split) for details. +* __Default Shared Path__: Starting in 7.0, setting the default shared path instructs the `dotnet monitor` tool to automatically share all artifacts (dumps, diagnostic ports, shared libraries, etc) with the target applications in the specified path. This setting simplifies configuration so that a setting for each feature that contains sharable information does not need to necessarily be specified. + +## Recommended container limits + +The following are the recommended memory and CPU minimums and limits for the `dotnet monitor` container. + +```yaml +resources: + reservations: + cpus: '0.050' + memory: 50M + limits: + cpus: '0.250' + memory: 256M +``` + +How much memory and CPU is consumed by dotnet-monitor is dependent on which scenarios are being executed: +- Metrics consume a negligible amount of resources, although using custom metrics can affect this. +- Operations such as traces and logs may require memory in the main application container that will automatically be allocated by the runtime. +- Resource consumption by trace operations is also dependent on which providers are enabled, as well as the [buffer size](./api/definitions.md#eventprovidersconfiguration) allocated in the runtime. +- It is not recommended to use highly verbose [log levels](./api/definitions.md#loglevel) while under load. This causes a lot of CPU usage in the dotnet-monitor container and more memory pressure in the main application container. +- Dumps also temporarily increase the amount of memory consumed by the application container. diff --git a/documentation/docker.md b/documentation/docker.md index 6470fa01ff8..e64c29919e4 100644 --- a/documentation/docker.md +++ b/documentation/docker.md @@ -15,3 +15,8 @@ In addition to its availability as a .NET CLI tool, the `dotnet monitor` tool is ### Nightly Repository - Docker Hub: https://hub.docker.com/_/microsoft-dotnet-nightly-monitor - Microsoft Container Registry: https://mcr.microsoft.com/v2/dotnet/nightly/monitor/tags/list + +## Sample Usage + +- For a Docker Compose sample, see [Running in Docker Compose](./docker-compose.md) +- For a Kubernetes sample, see [Running in Kubernetes](./kubernetes.md) \ No newline at end of file diff --git a/documentation/kubernetes.md b/documentation/kubernetes.md index 5acd9ba825d..c81d0f1c568 100644 --- a/documentation/kubernetes.md +++ b/documentation/kubernetes.md @@ -4,6 +4,8 @@ In addition to its availability as a .NET CLI tool, the `dotnet monitor` tool is For Dockerfiles and repository information, see [Running in Docker](./docker.md) +For a Docker Compose sample, see [Running in Docker Compose](./docker-compose.md) + ## Non-root considerations Starting with .NET 8.0, both the sample ASP.NET application and dotnet-monitor run as non-root. If both the application and dotnet-monitor are 8+, no additional configuration is required. Otherwise, a [security context](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/) configuration may need to be added to the application, dotnet-monitor, or both. diff --git a/documentation/releaseNotes/releaseNotes.v9.0.0-rc.1.md b/documentation/releaseNotes/releaseNotes.v9.0.0-rc.1.md new file mode 100644 index 00000000000..36872c179c5 --- /dev/null +++ b/documentation/releaseNotes/releaseNotes.v9.0.0-rc.1.md @@ -0,0 +1,7 @@ +Today we are releasing the official 9.0.0 Release Candidate of the `dotnet monitor` tool. This release includes: + +- Updated dependencies + + + +If you would like to provide additional feedback to the team [please fill out this survey](https://aka.ms/dotnet-monitor-survey?src=rn). \ No newline at end of file diff --git a/documentation/releases.md b/documentation/releases.md index ed412b7357e..0c30b147e48 100644 --- a/documentation/releases.md +++ b/documentation/releases.md @@ -21,6 +21,6 @@ | Version | Release Date | Latest Version | Runtime Frameworks | | --- | --- | --- | --- | -| 9.0 | August 13, 2024 | [9.0.0 preview 7](https://github.com/dotnet/dotnet-monitor/releases/tag/v9.0.0-preview.7.24408.4) | net9.0 | +| 9.0 | September 10, 2024 | [9.0.0 rc 1](https://github.com/dotnet/dotnet-monitor/releases/tag/v9.0.0-rc.1.24453.3) | net9.0 | diff --git a/eng/dependabot/independent/Versions.props b/eng/dependabot/independent/Versions.props index c6948b89b6f..084f7698854 100644 --- a/eng/dependabot/independent/Versions.props +++ b/eng/dependabot/independent/Versions.props @@ -14,7 +14,7 @@ 13.0.3 11.0.0 - 6.7.1 + 6.7.3 3.7.305.7 3.7.300.33 diff --git a/eng/pipelines/jobs/build.yml b/eng/pipelines/jobs/build.yml index 81fa81af2e5..0fe92fc4dad 100644 --- a/eng/pipelines/jobs/build.yml +++ b/eng/pipelines/jobs/build.yml @@ -57,7 +57,7 @@ jobs: ${{ if eq(variables['System.TeamProject'], 'public') }}: pool: name: $(DncEngPublicBuildPool) - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open + demands: ImageOverride -equals Build.Ubuntu.2204.Amd64.Open os: linux # Official Build Linux Pool diff --git a/eng/pipelines/stages/preparerelease.yml b/eng/pipelines/stages/preparerelease.yml index 4ae175a1142..69a50657678 100644 --- a/eng/pipelines/stages/preparerelease.yml +++ b/eng/pipelines/stages/preparerelease.yml @@ -22,10 +22,10 @@ stages: - group: Release-Pipeline steps: - task: UseDotNet@2 - displayName: 'Use .NET 6' + displayName: 'Use .NET 8' inputs: packageType: runtime - version: 6.x + version: 8.x installationPath: '$(Build.Repository.LocalPath)\.dotnet' - script: mkdir $(System.ArtifactsDirectory)\StagingToolLogs diff --git a/eng/release/DiagnosticsReleaseTool/DiagnosticsReleaseTool.csproj b/eng/release/DiagnosticsReleaseTool/DiagnosticsReleaseTool.csproj index 336e0567bce..40b32615d26 100644 --- a/eng/release/DiagnosticsReleaseTool/DiagnosticsReleaseTool.csproj +++ b/eng/release/DiagnosticsReleaseTool/DiagnosticsReleaseTool.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 false @@ -13,15 +13,15 @@ - - - - - - + + + + + + - + diff --git a/src/Microsoft.Diagnostics.Monitoring.StartupHook/Exceptions/Eventing/ExceptionsEventSource.cs b/src/Microsoft.Diagnostics.Monitoring.StartupHook/Exceptions/Eventing/ExceptionsEventSource.cs index efa325bb9a9..95806453b32 100644 --- a/src/Microsoft.Diagnostics.Monitoring.StartupHook/Exceptions/Eventing/ExceptionsEventSource.cs +++ b/src/Microsoft.Diagnostics.Monitoring.StartupHook/Exceptions/Eventing/ExceptionsEventSource.cs @@ -35,11 +35,11 @@ public void ExceptionGroup( public void ExceptionInstance( ulong ExceptionId, ulong ExceptionGroupId, - string? ExceptionMessage, + string ExceptionMessage, ulong[] StackFrameIds, DateTime Timestamp, ulong[] InnerExceptionIds, - string? ActivityId, + string ActivityId, ActivityIdFormat ActivityIdFormat) { Span data = stackalloc EventData[8]; diff --git a/src/Microsoft.Diagnostics.Monitoring.StartupHook/Exceptions/Pipeline/Steps/ExceptionEventsPipelineStep.cs b/src/Microsoft.Diagnostics.Monitoring.StartupHook/Exceptions/Pipeline/Steps/ExceptionEventsPipelineStep.cs index ec3dd331d44..6d8455208e7 100644 --- a/src/Microsoft.Diagnostics.Monitoring.StartupHook/Exceptions/Pipeline/Steps/ExceptionEventsPipelineStep.cs +++ b/src/Microsoft.Diagnostics.Monitoring.StartupHook/Exceptions/Pipeline/Steps/ExceptionEventsPipelineStep.cs @@ -60,7 +60,7 @@ public void Invoke(Exception exception, ExceptionPipelineExceptionContext contex frameIds, context.Timestamp, GetInnerExceptionsIds(exception), - context.ActivityId, + context.ActivityId ?? string.Empty, context.ActivityIdFormat ); } diff --git a/src/Microsoft.Diagnostics.Monitoring.WebApi/Exceptions/IExceptionInstance.cs b/src/Microsoft.Diagnostics.Monitoring.WebApi/Exceptions/IExceptionInstance.cs index 5b178bc477a..9ab5869d3d4 100644 --- a/src/Microsoft.Diagnostics.Monitoring.WebApi/Exceptions/IExceptionInstance.cs +++ b/src/Microsoft.Diagnostics.Monitoring.WebApi/Exceptions/IExceptionInstance.cs @@ -23,7 +23,7 @@ internal interface IExceptionInstance ulong[] InnerExceptionIds { get; } - public string? ActivityId { get; } + public string ActivityId { get; } public ActivityIdFormat ActivityIdFormat { get; } } diff --git a/src/Tests/Microsoft.Diagnostics.Monitoring.StartupHook.UnitTests/Exceptions/Eventing/ExceptionsEventSourceTests.cs b/src/Tests/Microsoft.Diagnostics.Monitoring.StartupHook.UnitTests/Exceptions/Eventing/ExceptionsEventSourceTests.cs index d2f156fb57d..20fd02bd7fe 100644 --- a/src/Tests/Microsoft.Diagnostics.Monitoring.StartupHook.UnitTests/Exceptions/Eventing/ExceptionsEventSourceTests.cs +++ b/src/Tests/Microsoft.Diagnostics.Monitoring.StartupHook.UnitTests/Exceptions/Eventing/ExceptionsEventSourceTests.cs @@ -111,7 +111,7 @@ public void ExceptionsEventSource_WriteException_LevelTooHigh() using ExceptionsEventListener listener = new(); listener.EnableEvents(source, EventLevel.Warning); - source.ExceptionInstance(5, 7, ObjectDisposedExceptionMessage, Array.Empty(), DateTime.UtcNow, Array.Empty(), null, ActivityIdFormat.Unknown); + source.ExceptionInstance(5, 7, ObjectDisposedExceptionMessage, Array.Empty(), DateTime.UtcNow, Array.Empty(), string.Empty, ActivityIdFormat.Unknown); Assert.Empty(listener.Exceptions); } @@ -123,7 +123,7 @@ public void ExceptionsEventSource_WriteException_NotEnabled() using ExceptionsEventListener listener = new(); - source.ExceptionInstance(7, 9, OperationCancelledExceptionMessage, Array.Empty(), DateTime.UtcNow, Array.Empty(), null, ActivityIdFormat.Unknown); + source.ExceptionInstance(7, 9, OperationCancelledExceptionMessage, Array.Empty(), DateTime.UtcNow, Array.Empty(), string.Empty, ActivityIdFormat.Unknown); Assert.Empty(listener.Exceptions); } From 9d30184985f3c454887a2daf2b3740b23b93ab17 Mon Sep 17 00:00:00 2001 From: Joe Schmitt <1146681+schmittjoseph@users.noreply.github.com> Date: Thu, 12 Sep 2024 14:06:48 -0700 Subject: [PATCH 406/568] Revert "[feature/9.x] Sync branch with origin/main (#7308)" (#7315) This reverts commit dca89048fdf516bc395b5b45565267b3ba8aa027. --- .github/releases.json | 6 +- documentation/README.md | 1 - documentation/docker-compose.md | 106 ------------------ documentation/docker.md | 5 - documentation/kubernetes.md | 2 - .../releaseNotes/releaseNotes.v9.0.0-rc.1.md | 7 -- documentation/releases.md | 2 +- eng/dependabot/independent/Versions.props | 2 +- eng/pipelines/jobs/build.yml | 2 +- eng/pipelines/stages/preparerelease.yml | 4 +- .../DiagnosticsReleaseTool.csproj | 16 +-- .../Eventing/ExceptionsEventSource.cs | 4 +- .../Steps/ExceptionEventsPipelineStep.cs | 2 +- .../Exceptions/IExceptionInstance.cs | 2 +- .../Eventing/ExceptionsEventSourceTests.cs | 4 +- 15 files changed, 22 insertions(+), 143 deletions(-) delete mode 100644 documentation/docker-compose.md delete mode 100644 documentation/releaseNotes/releaseNotes.v9.0.0-rc.1.md diff --git a/.github/releases.json b/.github/releases.json index 56527bd3268..45fefb64d19 100644 --- a/.github/releases.json +++ b/.github/releases.json @@ -65,9 +65,9 @@ "outOfSupportDate": "2024-05-14T00:00:00.000Z" }, "9.0": { - "tag": "v9.0.0-rc.1.24453.3", - "minorReleaseDate": "2024-09-10T00:00:00.000Z", - "patchReleaseDate": "2024-09-10T00:00:00.000Z", + "tag": "v9.0.0-preview.7.24408.4", + "minorReleaseDate": "2024-08-13T00:00:00.000Z", + "patchReleaseDate": "2024-08-13T00:00:00.000Z", "supportedFrameworks": [ "net9.0" ] diff --git a/documentation/README.md b/documentation/README.md index 30848283be0..c56dc5d4e1b 100644 --- a/documentation/README.md +++ b/documentation/README.md @@ -11,7 +11,6 @@ When running a dotnet application, differences in diverse local and production e - Getting Started - [Running on a local machine](./localmachine.md) - [Running in Docker](./docker.md) - - [Running in Docker Compose](./docker-compose.md) - [Running in Kubernetes](./kubernetes.md) - [API Endpoints](./api/README.md) - [OpenAPI document](./openapi.md) diff --git a/documentation/docker-compose.md b/documentation/docker-compose.md deleted file mode 100644 index 88706c44c36..00000000000 --- a/documentation/docker-compose.md +++ /dev/null @@ -1,106 +0,0 @@ -# Running in Docker Compose - -In addition to its availability as a .NET CLI tool, the `dotnet monitor` tool is available as a prebuilt Docker image that can be run in container runtimes and orchestrators, such as Docker Compose. - -For Dockerfiles and repository information, see [Running in Docker](./docker.md) - -For a Kubernetes sample, see [Running in Kubernetes](./kubernetes.md) - -## Non-root considerations - -Starting with .NET 8.0, both the sample ASP.NET application and dotnet-monitor run as non-root. If both the application and dotnet-monitor are 8+, no additional configuration is required. Otherwise, a [user](https://docs.docker.com/reference/compose-file/services/#user) configuration may need to be added to the application, dotnet-monitor, or both. - -## Example Deployment - -The following examples demonstrate a deployment of the dotnet-monitor container image monitoring an application container as services. - -
- .NET Monitor 8+ - -```yaml -# Tell us about your experience using dotnet monitor: https://aka.ms/dotnet-monitor-survey -services: - app: - image: mcr.microsoft.com/dotnet/samples:aspnetapp-chiseled - ports: - - "8080:8080" - environment: - - DOTNET_DiagnosticPorts=/diag/dotnet-monitor.sock - volumes: - - diagvol:/diag - deploy: - resources: - limits: - cpus: '0.250' - memory: 512M - - monitor: - image: mcr.microsoft.com/dotnet/monitor:8 - # DO NOT use the --no-auth argument for deployments in production; this argument is used for demonstration - # purposes only in this example. Please continue reading after this example for further details. - command: ["collect", "--no-auth"] - ports: - - "52323:52323" - - "52325:52325" - environment: - - DOTNETMONITOR_DiagnosticPort__ConnectionMode=Listen - - DOTNETMONITOR_Storage__DefaultSharedPath=/diag - # ALWAYS use the HTTPS form of the URL for deployments in production; the removal of HTTPS is done for - # demonstration purposes only in this example. Please continue reading after this example for further details. - - DOTNETMONITOR_Urls=http://+:52323 - # The metrics URL is set in the CMD instruction of the image by default. However, this deployment overrides that with the args setting; manually set the URL to the same value using configuration. - - DOTNETMONITOR_Metrics__Endpoints=http://+:52325 - # The image will output logging in a json format by default, which is great for ingestion by tools such as Azure Monitor Log Analytics. - # Switch the logging format to simple for this sample for easier reading. - - Logging__Console__FormatterName=simple - volumes: - - diagvol:/diag - deploy: - resources: - reservations: - cpus: '0.050' - memory: 50M - limits: - cpus: '0.250' - memory: 256M - -volumes: - diagvol: - driver_opts: - type: tmpfs - device: tmpfs -``` -
- -## Example Details - -* __Listen Mode__: The `dotnet monitor` tool is configured to run in `listen` mode. The tool establishes a diagnostic communication channel at the specified Unix Domain Socket path by the `DOTNETMONITOR_DiagnosticPort__EndpointName` environment variable. The application container has a `DOTNET_DiagnosticPorts` environment variable specified so that the application's runtime will communicate with the `dotnet monitor` instance at the specified Unix Domain Socket path. The application runtime will be suspended (e.g. no managed code execution) until it establishes communication with `dotnet monitor`. Application startup time will depend on how long it takes for the `dotnet monitor` container to run, but this should be quick. -> **7.0+**: Setting `DOTNETMONITOR_DiagnosticPort__EndpointName` is not necessary if (1) `DOTNETMONITOR_Storage__DefaultSharedPath` is set and (2) `DOTNETMONITOR_DiagnosticPort__ConnectionMode` is set to `Listen`; the combination of these settings automatically creates a Unix Domain Socket named `dotnet-monitor.sock` under the default shared path. The `DOTNETMONITOR_DiagnosticPort__EndpointName` setting is still available to use if the default behavior needs to be overridden. -* __Multiple Application Containers__: The `dotnet monitor` tool is capable of monitoring multiple processes at the same time. When running in `listen` mode, each of the applications can connect to the same communication channel path in order to allow `dotnet monitor` to observe them. -* __Dumps Temporary Folder__: The `dotnet monitor` tool is configured to instruct the application runtime to produce dump files at the path specified by the `DOTNETMONITOR_Storage__DumpTempFolder` environment variable. Without specifying this variable, the application runtime will create dump files in the `/tmp` directory of its container, which is not accessible by the `dotnet monitor` container in this example. -> **7.0+**: Setting `DOTNETMONITOR_Storage__DumpTempFolder` is not necessary if `DOTNETMONITOR_Storage__DefaultSharedPath` is set; dumps will be produced in a subfolder under the specified shared path. The `DOTNETMONITOR_Storage__DumpTempFolder` setting is still available to use if the default behavior needs to be overridden. -* __Disabled Authentication__: By default, the `dotnet monitor` tool requires authentication for any of the URLs specified by the `--urls` command line parameter or configured via the `ASPNETCORE_Urls`/`DOTNETMONITOR_Urls` environment variables (see [Authentication](./authentication.md) for further details). For the purposes of this example, authentication has been disabled by using the `--no-auth` command line switch. __Use of this command line switch is NOT recommended for production scenarios__ as it would allow anything with access to the URLs to be able to capture dumps, traces, etc (which may contain sensitive information, such as keys) of any process that `dotnet monitor` is able to monitor. -* __Disabled HTTPS__: By default, the `dotnet monitor` tool has HTTPS enabled on the default artifact URLs, which are configured to be `https://+:52323` in the Docker image. For the purposes of this example, the artifact URLs have been changed to `http://localhost:52323` using the `DOTNETMONITOR_Urls` environment variable such that a TLS certificate is not required. __Disabling HTTPS is NOT recommended for production scenarios.__ -* __Command Line Arguments__: Starting in 7.0, the default command line arguments for the `dotnet monitor` tool have been moved to the CMD instruction of the Docker image (previously, they were part of the ENTRYPOINT instruction). If the arguments of the image are overridden, then the default arguments must be explicitly specified in the overridden setting or set via configuration. See [7.0 Compatibility](compatibility/7.0/README.md#docker-container-entrypoint-split) for details. -* __Default Shared Path__: Starting in 7.0, setting the default shared path instructs the `dotnet monitor` tool to automatically share all artifacts (dumps, diagnostic ports, shared libraries, etc) with the target applications in the specified path. This setting simplifies configuration so that a setting for each feature that contains sharable information does not need to necessarily be specified. - -## Recommended container limits - -The following are the recommended memory and CPU minimums and limits for the `dotnet monitor` container. - -```yaml -resources: - reservations: - cpus: '0.050' - memory: 50M - limits: - cpus: '0.250' - memory: 256M -``` - -How much memory and CPU is consumed by dotnet-monitor is dependent on which scenarios are being executed: -- Metrics consume a negligible amount of resources, although using custom metrics can affect this. -- Operations such as traces and logs may require memory in the main application container that will automatically be allocated by the runtime. -- Resource consumption by trace operations is also dependent on which providers are enabled, as well as the [buffer size](./api/definitions.md#eventprovidersconfiguration) allocated in the runtime. -- It is not recommended to use highly verbose [log levels](./api/definitions.md#loglevel) while under load. This causes a lot of CPU usage in the dotnet-monitor container and more memory pressure in the main application container. -- Dumps also temporarily increase the amount of memory consumed by the application container. diff --git a/documentation/docker.md b/documentation/docker.md index e64c29919e4..6470fa01ff8 100644 --- a/documentation/docker.md +++ b/documentation/docker.md @@ -15,8 +15,3 @@ In addition to its availability as a .NET CLI tool, the `dotnet monitor` tool is ### Nightly Repository - Docker Hub: https://hub.docker.com/_/microsoft-dotnet-nightly-monitor - Microsoft Container Registry: https://mcr.microsoft.com/v2/dotnet/nightly/monitor/tags/list - -## Sample Usage - -- For a Docker Compose sample, see [Running in Docker Compose](./docker-compose.md) -- For a Kubernetes sample, see [Running in Kubernetes](./kubernetes.md) \ No newline at end of file diff --git a/documentation/kubernetes.md b/documentation/kubernetes.md index c81d0f1c568..5acd9ba825d 100644 --- a/documentation/kubernetes.md +++ b/documentation/kubernetes.md @@ -4,8 +4,6 @@ In addition to its availability as a .NET CLI tool, the `dotnet monitor` tool is For Dockerfiles and repository information, see [Running in Docker](./docker.md) -For a Docker Compose sample, see [Running in Docker Compose](./docker-compose.md) - ## Non-root considerations Starting with .NET 8.0, both the sample ASP.NET application and dotnet-monitor run as non-root. If both the application and dotnet-monitor are 8+, no additional configuration is required. Otherwise, a [security context](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/) configuration may need to be added to the application, dotnet-monitor, or both. diff --git a/documentation/releaseNotes/releaseNotes.v9.0.0-rc.1.md b/documentation/releaseNotes/releaseNotes.v9.0.0-rc.1.md deleted file mode 100644 index 36872c179c5..00000000000 --- a/documentation/releaseNotes/releaseNotes.v9.0.0-rc.1.md +++ /dev/null @@ -1,7 +0,0 @@ -Today we are releasing the official 9.0.0 Release Candidate of the `dotnet monitor` tool. This release includes: - -- Updated dependencies - - - -If you would like to provide additional feedback to the team [please fill out this survey](https://aka.ms/dotnet-monitor-survey?src=rn). \ No newline at end of file diff --git a/documentation/releases.md b/documentation/releases.md index 0c30b147e48..ed412b7357e 100644 --- a/documentation/releases.md +++ b/documentation/releases.md @@ -21,6 +21,6 @@ | Version | Release Date | Latest Version | Runtime Frameworks | | --- | --- | --- | --- | -| 9.0 | September 10, 2024 | [9.0.0 rc 1](https://github.com/dotnet/dotnet-monitor/releases/tag/v9.0.0-rc.1.24453.3) | net9.0 | +| 9.0 | August 13, 2024 | [9.0.0 preview 7](https://github.com/dotnet/dotnet-monitor/releases/tag/v9.0.0-preview.7.24408.4) | net9.0 | diff --git a/eng/dependabot/independent/Versions.props b/eng/dependabot/independent/Versions.props index 084f7698854..c6948b89b6f 100644 --- a/eng/dependabot/independent/Versions.props +++ b/eng/dependabot/independent/Versions.props @@ -14,7 +14,7 @@ 13.0.3 11.0.0 - 6.7.3 + 6.7.1 3.7.305.7 3.7.300.33 diff --git a/eng/pipelines/jobs/build.yml b/eng/pipelines/jobs/build.yml index 0fe92fc4dad..81fa81af2e5 100644 --- a/eng/pipelines/jobs/build.yml +++ b/eng/pipelines/jobs/build.yml @@ -57,7 +57,7 @@ jobs: ${{ if eq(variables['System.TeamProject'], 'public') }}: pool: name: $(DncEngPublicBuildPool) - demands: ImageOverride -equals Build.Ubuntu.2204.Amd64.Open + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open os: linux # Official Build Linux Pool diff --git a/eng/pipelines/stages/preparerelease.yml b/eng/pipelines/stages/preparerelease.yml index 69a50657678..4ae175a1142 100644 --- a/eng/pipelines/stages/preparerelease.yml +++ b/eng/pipelines/stages/preparerelease.yml @@ -22,10 +22,10 @@ stages: - group: Release-Pipeline steps: - task: UseDotNet@2 - displayName: 'Use .NET 8' + displayName: 'Use .NET 6' inputs: packageType: runtime - version: 8.x + version: 6.x installationPath: '$(Build.Repository.LocalPath)\.dotnet' - script: mkdir $(System.ArtifactsDirectory)\StagingToolLogs diff --git a/eng/release/DiagnosticsReleaseTool/DiagnosticsReleaseTool.csproj b/eng/release/DiagnosticsReleaseTool/DiagnosticsReleaseTool.csproj index 40b32615d26..336e0567bce 100644 --- a/eng/release/DiagnosticsReleaseTool/DiagnosticsReleaseTool.csproj +++ b/eng/release/DiagnosticsReleaseTool/DiagnosticsReleaseTool.csproj @@ -2,7 +2,7 @@ Exe - net8.0 + net6.0 false @@ -13,15 +13,15 @@ - - - - - - + + + + + + - + diff --git a/src/Microsoft.Diagnostics.Monitoring.StartupHook/Exceptions/Eventing/ExceptionsEventSource.cs b/src/Microsoft.Diagnostics.Monitoring.StartupHook/Exceptions/Eventing/ExceptionsEventSource.cs index 95806453b32..efa325bb9a9 100644 --- a/src/Microsoft.Diagnostics.Monitoring.StartupHook/Exceptions/Eventing/ExceptionsEventSource.cs +++ b/src/Microsoft.Diagnostics.Monitoring.StartupHook/Exceptions/Eventing/ExceptionsEventSource.cs @@ -35,11 +35,11 @@ public void ExceptionGroup( public void ExceptionInstance( ulong ExceptionId, ulong ExceptionGroupId, - string ExceptionMessage, + string? ExceptionMessage, ulong[] StackFrameIds, DateTime Timestamp, ulong[] InnerExceptionIds, - string ActivityId, + string? ActivityId, ActivityIdFormat ActivityIdFormat) { Span data = stackalloc EventData[8]; diff --git a/src/Microsoft.Diagnostics.Monitoring.StartupHook/Exceptions/Pipeline/Steps/ExceptionEventsPipelineStep.cs b/src/Microsoft.Diagnostics.Monitoring.StartupHook/Exceptions/Pipeline/Steps/ExceptionEventsPipelineStep.cs index 6d8455208e7..ec3dd331d44 100644 --- a/src/Microsoft.Diagnostics.Monitoring.StartupHook/Exceptions/Pipeline/Steps/ExceptionEventsPipelineStep.cs +++ b/src/Microsoft.Diagnostics.Monitoring.StartupHook/Exceptions/Pipeline/Steps/ExceptionEventsPipelineStep.cs @@ -60,7 +60,7 @@ public void Invoke(Exception exception, ExceptionPipelineExceptionContext contex frameIds, context.Timestamp, GetInnerExceptionsIds(exception), - context.ActivityId ?? string.Empty, + context.ActivityId, context.ActivityIdFormat ); } diff --git a/src/Microsoft.Diagnostics.Monitoring.WebApi/Exceptions/IExceptionInstance.cs b/src/Microsoft.Diagnostics.Monitoring.WebApi/Exceptions/IExceptionInstance.cs index 9ab5869d3d4..5b178bc477a 100644 --- a/src/Microsoft.Diagnostics.Monitoring.WebApi/Exceptions/IExceptionInstance.cs +++ b/src/Microsoft.Diagnostics.Monitoring.WebApi/Exceptions/IExceptionInstance.cs @@ -23,7 +23,7 @@ internal interface IExceptionInstance ulong[] InnerExceptionIds { get; } - public string ActivityId { get; } + public string? ActivityId { get; } public ActivityIdFormat ActivityIdFormat { get; } } diff --git a/src/Tests/Microsoft.Diagnostics.Monitoring.StartupHook.UnitTests/Exceptions/Eventing/ExceptionsEventSourceTests.cs b/src/Tests/Microsoft.Diagnostics.Monitoring.StartupHook.UnitTests/Exceptions/Eventing/ExceptionsEventSourceTests.cs index 20fd02bd7fe..d2f156fb57d 100644 --- a/src/Tests/Microsoft.Diagnostics.Monitoring.StartupHook.UnitTests/Exceptions/Eventing/ExceptionsEventSourceTests.cs +++ b/src/Tests/Microsoft.Diagnostics.Monitoring.StartupHook.UnitTests/Exceptions/Eventing/ExceptionsEventSourceTests.cs @@ -111,7 +111,7 @@ public void ExceptionsEventSource_WriteException_LevelTooHigh() using ExceptionsEventListener listener = new(); listener.EnableEvents(source, EventLevel.Warning); - source.ExceptionInstance(5, 7, ObjectDisposedExceptionMessage, Array.Empty(), DateTime.UtcNow, Array.Empty(), string.Empty, ActivityIdFormat.Unknown); + source.ExceptionInstance(5, 7, ObjectDisposedExceptionMessage, Array.Empty(), DateTime.UtcNow, Array.Empty(), null, ActivityIdFormat.Unknown); Assert.Empty(listener.Exceptions); } @@ -123,7 +123,7 @@ public void ExceptionsEventSource_WriteException_NotEnabled() using ExceptionsEventListener listener = new(); - source.ExceptionInstance(7, 9, OperationCancelledExceptionMessage, Array.Empty(), DateTime.UtcNow, Array.Empty(), string.Empty, ActivityIdFormat.Unknown); + source.ExceptionInstance(7, 9, OperationCancelledExceptionMessage, Array.Empty(), DateTime.UtcNow, Array.Empty(), null, ActivityIdFormat.Unknown); Assert.Empty(listener.Exceptions); } From f7cee03bece30a8d3d9c2b737d345e5f4c61dd8a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 12 Sep 2024 21:38:07 +0000 Subject: [PATCH 407/568] Restore branch-specific files --- .../steps/get-delegation-sas.yml | 27 ++++--------------- 1 file changed, 5 insertions(+), 22 deletions(-) diff --git a/eng/common/templates-official/steps/get-delegation-sas.yml b/eng/common/templates-official/steps/get-delegation-sas.yml index d3f0671373b..c5a9c1f8275 100644 --- a/eng/common/templates-official/steps/get-delegation-sas.yml +++ b/eng/common/templates-official/steps/get-delegation-sas.yml @@ -1,24 +1,7 @@ steps: -- task: AzureCLI@2 - displayName: 'Generate delegation SAS Token for ${{ parameters.storageAccount }}/${{ parameters.container }}' - inputs: - azureSubscription: ${{ parameters.federatedServiceConnection }} - scriptType: 'pscore' - scriptLocation: 'inlineScript' - inlineScript: | - # Calculate the expiration of the SAS token and convert to UTC - $expiry = (Get-Date).AddHours(${{ parameters.expiryInHours }}).ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ssZ") +- template: /eng/common/core-templates/steps/get-delegation-sas.yml + parameters: + is1ESPipeline: true - $sas = az storage container generate-sas --account-name ${{ parameters.storageAccount }} --name ${{ parameters.container }} --permissions ${{ parameters.permissions }} --expiry $expiry --auth-mode login --as-user -o tsv - - if ($LASTEXITCODE -ne 0) { - Write-Error "Failed to generate SAS token." - exit 1 - } - - if ('${{ parameters.base64Encode }}' -eq 'true') { - $sas = [Convert]::ToBase64String([System.Text.Encoding]::UTF8.GetBytes($sas)) - } - - Write-Host "Setting '${{ parameters.outputVariableName }}' with the access token value" - Write-Host "##vso[task.setvariable variable=${{ parameters.outputVariableName }};issecret=true]$sas" + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} From e633c0919a1812e7b9414de1980033bb3cadec0b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 13 Sep 2024 14:31:39 +0000 Subject: [PATCH 408/568] Update dependencies from https://github.com/dotnet/sdk build 20240913.6 (#7320) [feature/9.x] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Runtime.win-x64: from 9.0.0-rc.2.24461.26 to 9.0.0-rc.2.24462.5 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) - Microsoft.NETCore.App.Runtime.win-x64: from 9.0.0-rc.2.24459.11 to 9.0.0-rc.2.24461.16 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) - VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0: from 9.0.0-rc.2.24461.26 to 9.0.0-rc.2.24462.5 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) - VS.Redist.Common.NetCore.SharedFramework.x64.9.0: from 9.0.0-rc.2.24459.11 to 9.0.0-rc.2.24461.16 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cf9e4db4bcc..1c5a5c3b464 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/aspnetcore - a961b93bca44f3013d526f4b879b550afabe2da0 + 37dd88bdfb6cfba5122ad0cc13ace787628b93cb https://github.com/dotnet/diagnostics @@ -46,21 +46,21 @@ https://github.com/dotnet/diagnostics a5c4167284a37e2bd48924bc832f1a17ee498e98 - + https://github.com/dotnet/runtime - d32b46121993f762367238e1fad834205dc9123c + 73229ad78184da1ee76e60e937651e4b8827f31c - + https://github.com/dotnet/aspnetcore - a961b93bca44f3013d526f4b879b550afabe2da0 + 37dd88bdfb6cfba5122ad0cc13ace787628b93cb - + https://github.com/dotnet/sdk - 8128f3953717402d2b9b5d903f0f4558485ebd00 + d25ec6ba36c1c53e93cc608b6a9f53d9c644488b - + https://github.com/dotnet/runtime - d32b46121993f762367238e1fad834205dc9123c + 73229ad78184da1ee76e60e937651e4b8827f31c diff --git a/eng/Versions.props b/eng/Versions.props index 25d8015d4c3..c12f7e80d44 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,8 +52,8 @@ 9.0.0-beta.24459.6 9.0.0-beta.24459.6 - 9.0.0-rc.2.24461.26 - 9.0.0-rc.2.24461.26 + 9.0.0-rc.2.24462.5 + 9.0.0-rc.2.24462.5 2.0.0-beta4.24324.3 @@ -62,10 +62,10 @@ 9.0.0-preview.24454.1 - 9.0.0-rc.2.24459.11 - 9.0.0-rc.2.24459.11 + 9.0.0-rc.2.24461.16 + 9.0.0-rc.2.24461.16 - 9.0.100-rc.2.24462.6 + 9.0.100-rc.2.24463.6 1.0.546001 From 93e83b1185bf77879a8ba9effba1eae97f5e6906 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 13 Sep 2024 14:32:27 +0000 Subject: [PATCH 409/568] Update dependencies from https://github.com/dotnet/arcade build 20240912.3 (#7319) [feature/9.x] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- global.json | 6 +++--- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1c5a5c3b464..32d0e2dae84 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,25 +22,25 @@ https://github.com/dotnet/roslyn-analyzers a7c74cf887abe4a38240bc4ead0b221d9d42434f - + https://github.com/dotnet/arcade - 65260b148c869ada772a5843863c54737cd2361e + 91b9734abbad751d575c002b30778c88d978993c - + https://github.com/dotnet/arcade - 65260b148c869ada772a5843863c54737cd2361e + 91b9734abbad751d575c002b30778c88d978993c - + https://github.com/dotnet/arcade - 65260b148c869ada772a5843863c54737cd2361e + 91b9734abbad751d575c002b30778c88d978993c - + https://github.com/dotnet/arcade - 65260b148c869ada772a5843863c54737cd2361e + 91b9734abbad751d575c002b30778c88d978993c - + https://github.com/dotnet/arcade - 65260b148c869ada772a5843863c54737cd2361e + 91b9734abbad751d575c002b30778c88d978993c https://github.com/dotnet/diagnostics diff --git a/eng/Versions.props b/eng/Versions.props index c12f7e80d44..f75ef033eb8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,9 +48,9 @@ --> - 9.0.0-beta.24459.6 - 9.0.0-beta.24459.6 - 9.0.0-beta.24459.6 + 9.0.0-beta.24462.3 + 9.0.0-beta.24462.3 + 9.0.0-beta.24462.3 9.0.0-rc.2.24462.5 9.0.0-rc.2.24462.5 diff --git a/global.json b/global.json index 69ad052c703..56cd1dea511 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "9.0.100-preview.7.24407.12", + "dotnet": "9.0.100-rc.1.24452.12", "runtimes": { "aspnetcore": [ "$(MicrosoftAspNetCoreApp60Version)", @@ -31,7 +31,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24459.6", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24459.6" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24462.3", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24462.3" } } From f64940c7481ca08ac412118b2f2447c823744c84 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 13 Sep 2024 10:08:01 -0700 Subject: [PATCH 410/568] [feature/9.x] Update dependencies from dotnet/diagnostics (#7312) * Update dependencies from https://github.com/dotnet/diagnostics build 20240911.2 Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe , Microsoft.FileFormats From Version 8.0.0-preview.24460.1 -> To Version 8.0.0-preview.24461.2 * Update dependencies from https://github.com/dotnet/diagnostics build 20240912.1 Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe , Microsoft.FileFormats From Version 8.0.0-preview.24461.2 -> To Version 8.0.0-preview.24462.1 --------- Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 32d0e2dae84..2e8b3c6ef51 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore 37dd88bdfb6cfba5122ad0cc13ace787628b93cb - + https://github.com/dotnet/diagnostics - a5c4167284a37e2bd48924bc832f1a17ee498e98 + c5b287f7b944f2a407a76f4beb119fa75e145f7b - + https://github.com/dotnet/diagnostics - a5c4167284a37e2bd48924bc832f1a17ee498e98 + c5b287f7b944f2a407a76f4beb119fa75e145f7b https://github.com/dotnet/command-line-api @@ -42,9 +42,9 @@ https://github.com/dotnet/arcade 91b9734abbad751d575c002b30778c88d978993c - + https://github.com/dotnet/diagnostics - a5c4167284a37e2bd48924bc832f1a17ee498e98 + c5b287f7b944f2a407a76f4beb119fa75e145f7b https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index f75ef033eb8..6ab7144a524 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24324.3 - 8.0.0-preview.24460.1 - 8.0.0-preview.24460.1 + 8.0.0-preview.24462.1 + 8.0.0-preview.24462.1 9.0.0-preview.24454.1 @@ -67,7 +67,7 @@ 9.0.100-rc.2.24463.6 - 1.0.546001 + 1.0.546201 $(MicrosoftNETCoreApp31Version) From 9213029de82b5b9ef77bf57fab359d42ff6c10d0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 14 Sep 2024 14:33:56 +0000 Subject: [PATCH 411/568] Update dependencies from https://github.com/dotnet/diagnostics build 20240913.2 (#7326) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2e8b3c6ef51..2dd942c84e3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore 37dd88bdfb6cfba5122ad0cc13ace787628b93cb - + https://github.com/dotnet/diagnostics - c5b287f7b944f2a407a76f4beb119fa75e145f7b + b120f1ca4fc9b28dda8930b8c2323d48cdc37e44 - + https://github.com/dotnet/diagnostics - c5b287f7b944f2a407a76f4beb119fa75e145f7b + b120f1ca4fc9b28dda8930b8c2323d48cdc37e44 https://github.com/dotnet/command-line-api @@ -42,9 +42,9 @@ https://github.com/dotnet/arcade 91b9734abbad751d575c002b30778c88d978993c - + https://github.com/dotnet/diagnostics - c5b287f7b944f2a407a76f4beb119fa75e145f7b + b120f1ca4fc9b28dda8930b8c2323d48cdc37e44 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 6ab7144a524..2dab0f17cd2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24324.3 - 8.0.0-preview.24462.1 - 8.0.0-preview.24462.1 + 8.0.0-preview.24463.2 + 8.0.0-preview.24463.2 9.0.0-preview.24454.1 @@ -67,7 +67,7 @@ 9.0.100-rc.2.24463.6 - 1.0.546201 + 1.0.546302 $(MicrosoftNETCoreApp31Version) From 89fe8a6d26083efeba18d0fc81bbfce900104821 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 14 Sep 2024 14:35:55 +0000 Subject: [PATCH 412/568] Update dependencies from https://github.com/dotnet/sdk build 20240913.45 (#7328) [feature/9.x] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Runtime.win-x64: from 9.0.0-rc.2.24462.5 to 9.0.0-rc.2.24463.6 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) - Microsoft.NETCore.App.Runtime.win-x64: from 9.0.0-rc.2.24461.16 to 9.0.0-rc.2.24462.10 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) - VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0: from 9.0.0-rc.2.24462.5 to 9.0.0-rc.2.24463.6 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) - VS.Redist.Common.NetCore.SharedFramework.x64.9.0: from 9.0.0-rc.2.24461.16 to 9.0.0-rc.2.24462.10 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2dd942c84e3..b0c12f42247 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/aspnetcore - 37dd88bdfb6cfba5122ad0cc13ace787628b93cb + 4f2a59c5352e399830e09b22ecbcfd5d5312c5b3 https://github.com/dotnet/diagnostics @@ -46,21 +46,21 @@ https://github.com/dotnet/diagnostics b120f1ca4fc9b28dda8930b8c2323d48cdc37e44 - + https://github.com/dotnet/runtime - 73229ad78184da1ee76e60e937651e4b8827f31c + 9bff9c5017d8444fdf76959c112dd9fed2da9317 - + https://github.com/dotnet/aspnetcore - 37dd88bdfb6cfba5122ad0cc13ace787628b93cb + 4f2a59c5352e399830e09b22ecbcfd5d5312c5b3 - + https://github.com/dotnet/sdk - d25ec6ba36c1c53e93cc608b6a9f53d9c644488b + 0f07337f8d90cdbedca89e64bac6e26148d07642 - + https://github.com/dotnet/runtime - 73229ad78184da1ee76e60e937651e4b8827f31c + 9bff9c5017d8444fdf76959c112dd9fed2da9317 diff --git a/eng/Versions.props b/eng/Versions.props index 2dab0f17cd2..8bccb01b675 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,8 +52,8 @@ 9.0.0-beta.24462.3 9.0.0-beta.24462.3 - 9.0.0-rc.2.24462.5 - 9.0.0-rc.2.24462.5 + 9.0.0-rc.2.24463.6 + 9.0.0-rc.2.24463.6 2.0.0-beta4.24324.3 @@ -62,10 +62,10 @@ 9.0.0-preview.24454.1 - 9.0.0-rc.2.24461.16 - 9.0.0-rc.2.24461.16 + 9.0.0-rc.2.24462.10 + 9.0.0-rc.2.24462.10 - 9.0.100-rc.2.24463.6 + 9.0.100-rc.2.24463.45 1.0.546302 From b8ea459637fae552ead749832a66d9178231aeb9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 14 Sep 2024 14:36:14 +0000 Subject: [PATCH 413/568] Update dependencies from https://github.com/dotnet/arcade build 20240913.2 (#7327) [feature/9.x] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- global.json | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b0c12f42247..12f5e828bc3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,25 +22,25 @@ https://github.com/dotnet/roslyn-analyzers a7c74cf887abe4a38240bc4ead0b221d9d42434f - + https://github.com/dotnet/arcade - 91b9734abbad751d575c002b30778c88d978993c + bcba6939456aa552554eae9ea9538a039cc98d96 - + https://github.com/dotnet/arcade - 91b9734abbad751d575c002b30778c88d978993c + bcba6939456aa552554eae9ea9538a039cc98d96 - + https://github.com/dotnet/arcade - 91b9734abbad751d575c002b30778c88d978993c + bcba6939456aa552554eae9ea9538a039cc98d96 - + https://github.com/dotnet/arcade - 91b9734abbad751d575c002b30778c88d978993c + bcba6939456aa552554eae9ea9538a039cc98d96 - + https://github.com/dotnet/arcade - 91b9734abbad751d575c002b30778c88d978993c + bcba6939456aa552554eae9ea9538a039cc98d96 https://github.com/dotnet/diagnostics diff --git a/eng/Versions.props b/eng/Versions.props index 8bccb01b675..e19023d549b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,9 +48,9 @@ --> - 9.0.0-beta.24462.3 - 9.0.0-beta.24462.3 - 9.0.0-beta.24462.3 + 9.0.0-beta.24463.2 + 9.0.0-beta.24463.2 + 9.0.0-beta.24463.2 9.0.0-rc.2.24463.6 9.0.0-rc.2.24463.6 diff --git a/global.json b/global.json index 56cd1dea511..6e8c49cbb12 100644 --- a/global.json +++ b/global.json @@ -31,7 +31,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24462.3", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24462.3" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24463.2", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24463.2" } } From d8a6c5c2a7458e3ab061a47a5c36d642d0cef44b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 15 Sep 2024 13:57:34 +0000 Subject: [PATCH 414/568] Update dependencies from https://github.com/dotnet/sdk build 20240914.3 (#7329) [feature/9.x] Update dependencies from dotnet/sdk --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 12f5e828bc3..324b46f0cf9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,9 +54,9 @@ https://github.com/dotnet/aspnetcore 4f2a59c5352e399830e09b22ecbcfd5d5312c5b3 - + https://github.com/dotnet/sdk - 0f07337f8d90cdbedca89e64bac6e26148d07642 + 1a658dfc714a5064eea57af48d5fd68a3ffab7ef https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index e19023d549b..940f356c592 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,7 +65,7 @@ 9.0.0-rc.2.24462.10 9.0.0-rc.2.24462.10 - 9.0.100-rc.2.24463.45 + 9.0.100-rc.2.24464.3 1.0.546302 From d0e018c78684e5450df9e2d89c262bc372730fb2 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 16 Sep 2024 09:49:54 -0700 Subject: [PATCH 415/568] [feature/9.x] Sync branch with origin/main (#7330) * Update dependencies from https://github.com/dotnet/diagnostics build 20240912.1 (#7317) [main] Update dependencies from dotnet/diagnostics * Update dependencies from https://github.com/dotnet/arcade build 20240911.2 (#7318) [main] Update dependencies from dotnet/arcade --------- Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> From c73bb6a86cdd8e27a901171d24e00055d17dd2ab Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 17 Sep 2024 14:41:58 +0000 Subject: [PATCH 416/568] Update dependencies from https://github.com/dotnet/arcade build 20240916.2 (#7332) [feature/9.x] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- global.json | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 324b46f0cf9..2c4c7774a70 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,25 +22,25 @@ https://github.com/dotnet/roslyn-analyzers a7c74cf887abe4a38240bc4ead0b221d9d42434f - + https://github.com/dotnet/arcade - bcba6939456aa552554eae9ea9538a039cc98d96 + 04b9022eba9c184a8036328af513c22e6949e8b6 - + https://github.com/dotnet/arcade - bcba6939456aa552554eae9ea9538a039cc98d96 + 04b9022eba9c184a8036328af513c22e6949e8b6 - + https://github.com/dotnet/arcade - bcba6939456aa552554eae9ea9538a039cc98d96 + 04b9022eba9c184a8036328af513c22e6949e8b6 - + https://github.com/dotnet/arcade - bcba6939456aa552554eae9ea9538a039cc98d96 + 04b9022eba9c184a8036328af513c22e6949e8b6 - + https://github.com/dotnet/arcade - bcba6939456aa552554eae9ea9538a039cc98d96 + 04b9022eba9c184a8036328af513c22e6949e8b6 https://github.com/dotnet/diagnostics diff --git a/eng/Versions.props b/eng/Versions.props index 940f356c592..d4bed4ea742 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,9 +48,9 @@ --> - 9.0.0-beta.24463.2 - 9.0.0-beta.24463.2 - 9.0.0-beta.24463.2 + 9.0.0-beta.24466.2 + 9.0.0-beta.24466.2 + 9.0.0-beta.24466.2 9.0.0-rc.2.24463.6 9.0.0-rc.2.24463.6 diff --git a/global.json b/global.json index 6e8c49cbb12..78446834ac7 100644 --- a/global.json +++ b/global.json @@ -31,7 +31,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24463.2", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24463.2" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24466.2", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24466.2" } } From dd66f85ef522385cd46e27d67fc33ea34c29cd19 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 17 Sep 2024 14:42:42 +0000 Subject: [PATCH 417/568] Update dependencies from https://github.com/dotnet/sdk build 20240916.29 (#7333) [feature/9.x] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Runtime.win-x64: from 9.0.0-rc.2.24463.6 to 9.0.0-rc.2.24466.2 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) - Microsoft.NETCore.App.Runtime.win-x64: from 9.0.0-rc.2.24462.10 to 9.0.0-rc.2.24463.7 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) - VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0: from 9.0.0-rc.2.24463.6 to 9.0.0-rc.2.24466.2 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) - VS.Redist.Common.NetCore.SharedFramework.x64.9.0: from 9.0.0-rc.2.24462.10 to 9.0.0-rc.2.24463.7 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2c4c7774a70..c1c7acf1ff6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/aspnetcore - 4f2a59c5352e399830e09b22ecbcfd5d5312c5b3 + 9b3ca0b29a32cce87ec14d6c707d406e52834412 https://github.com/dotnet/diagnostics @@ -46,21 +46,21 @@ https://github.com/dotnet/diagnostics b120f1ca4fc9b28dda8930b8c2323d48cdc37e44 - + https://github.com/dotnet/runtime - 9bff9c5017d8444fdf76959c112dd9fed2da9317 + 46cfb747b4c22471242dee0d106f5c79cf9fd4c5 - + https://github.com/dotnet/aspnetcore - 4f2a59c5352e399830e09b22ecbcfd5d5312c5b3 + 9b3ca0b29a32cce87ec14d6c707d406e52834412 - + https://github.com/dotnet/sdk - 1a658dfc714a5064eea57af48d5fd68a3ffab7ef + 92b8b5eb946e486e97ad3d22937e4d3203a0c7d0 - + https://github.com/dotnet/runtime - 9bff9c5017d8444fdf76959c112dd9fed2da9317 + 46cfb747b4c22471242dee0d106f5c79cf9fd4c5 diff --git a/eng/Versions.props b/eng/Versions.props index d4bed4ea742..618d845f16b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,8 +52,8 @@ 9.0.0-beta.24466.2 9.0.0-beta.24466.2 - 9.0.0-rc.2.24463.6 - 9.0.0-rc.2.24463.6 + 9.0.0-rc.2.24466.2 + 9.0.0-rc.2.24466.2 2.0.0-beta4.24324.3 @@ -62,10 +62,10 @@ 9.0.0-preview.24454.1 - 9.0.0-rc.2.24462.10 - 9.0.0-rc.2.24462.10 + 9.0.0-rc.2.24463.7 + 9.0.0-rc.2.24463.7 - 9.0.100-rc.2.24464.3 + 9.0.100-rc.2.24466.29 1.0.546302 From 306ebb88371f2d4436c3ff5c86dde9b6cc0baf92 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 18 Sep 2024 14:08:10 +0000 Subject: [PATCH 418/568] Update dependencies from https://github.com/dotnet/diagnostics build 20240917.1 (#7335) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c1c7acf1ff6..bfadd3558dc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore 9b3ca0b29a32cce87ec14d6c707d406e52834412 - + https://github.com/dotnet/diagnostics - b120f1ca4fc9b28dda8930b8c2323d48cdc37e44 + d67bd581004a39554a5e58cd33c53d12814637b5 - + https://github.com/dotnet/diagnostics - b120f1ca4fc9b28dda8930b8c2323d48cdc37e44 + d67bd581004a39554a5e58cd33c53d12814637b5 https://github.com/dotnet/command-line-api @@ -42,9 +42,9 @@ https://github.com/dotnet/arcade 04b9022eba9c184a8036328af513c22e6949e8b6 - + https://github.com/dotnet/diagnostics - b120f1ca4fc9b28dda8930b8c2323d48cdc37e44 + d67bd581004a39554a5e58cd33c53d12814637b5 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 618d845f16b..dddc1dc8835 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24324.3 - 8.0.0-preview.24463.2 - 8.0.0-preview.24463.2 + 8.0.0-preview.24467.1 + 8.0.0-preview.24467.1 9.0.0-preview.24454.1 @@ -67,7 +67,7 @@ 9.0.100-rc.2.24466.29 - 1.0.546302 + 1.0.546701 $(MicrosoftNETCoreApp31Version) From d4463b7145878c532140deb9b07a007ac792f87c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 18 Sep 2024 14:10:52 +0000 Subject: [PATCH 419/568] Update dependencies from https://github.com/dotnet/sdk build 20240918.2 (#7336) [feature/9.x] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Runtime.win-x64: from 9.0.0-rc.2.24466.2 to 9.0.0-rtm.24466.12 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) - VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0: from 9.0.0-rc.2.24466.2 to 9.0.0-rtm.24466.12 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bfadd3558dc..cfdfc0031bb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/aspnetcore - 9b3ca0b29a32cce87ec14d6c707d406e52834412 + 0d72ad5e4c5b1394e9708f47ed81e9748e4fd819 https://github.com/dotnet/diagnostics @@ -50,13 +50,13 @@ https://github.com/dotnet/runtime 46cfb747b4c22471242dee0d106f5c79cf9fd4c5 - + https://github.com/dotnet/aspnetcore - 9b3ca0b29a32cce87ec14d6c707d406e52834412 + 0d72ad5e4c5b1394e9708f47ed81e9748e4fd819 - + https://github.com/dotnet/sdk - 92b8b5eb946e486e97ad3d22937e4d3203a0c7d0 + c204043de141a4d00ae5b4ec1b82aab67cccac1d https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index dddc1dc8835..b8ee79056da 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,8 +52,8 @@ 9.0.0-beta.24466.2 9.0.0-beta.24466.2 - 9.0.0-rc.2.24466.2 - 9.0.0-rc.2.24466.2 + 9.0.0-rtm.24466.12 + 9.0.0-rtm.24466.12 2.0.0-beta4.24324.3 @@ -65,7 +65,7 @@ 9.0.0-rc.2.24463.7 9.0.0-rc.2.24463.7 - 9.0.100-rc.2.24466.29 + 9.0.100-rc.2.24468.2 1.0.546701 From ebe00f8382eae4c23e8e13b50fee918140ad522d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 20 Sep 2024 09:50:26 -0700 Subject: [PATCH 420/568] [feature/9.x] Update dependencies from dotnet/diagnostics (#7338) * Update dependencies from https://github.com/dotnet/diagnostics build 20240918.2 Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe , Microsoft.FileFormats From Version 8.0.0-preview.24467.1 -> To Version 8.0.0-preview.24468.2 * Update dependencies from https://github.com/dotnet/diagnostics build 20240919.2 Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe , Microsoft.FileFormats From Version 8.0.0-preview.24468.2 -> To Version 8.0.0-preview.24469.2 --------- Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cfdfc0031bb..e2de721be9e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore 0d72ad5e4c5b1394e9708f47ed81e9748e4fd819 - + https://github.com/dotnet/diagnostics - d67bd581004a39554a5e58cd33c53d12814637b5 + 37b70e07df52a98d08093565c574d423eff9e795 - + https://github.com/dotnet/diagnostics - d67bd581004a39554a5e58cd33c53d12814637b5 + 37b70e07df52a98d08093565c574d423eff9e795 https://github.com/dotnet/command-line-api @@ -42,9 +42,9 @@ https://github.com/dotnet/arcade 04b9022eba9c184a8036328af513c22e6949e8b6 - + https://github.com/dotnet/diagnostics - d67bd581004a39554a5e58cd33c53d12814637b5 + 37b70e07df52a98d08093565c574d423eff9e795 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index b8ee79056da..6b1b670ebe7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24324.3 - 8.0.0-preview.24467.1 - 8.0.0-preview.24467.1 + 8.0.0-preview.24469.2 + 8.0.0-preview.24469.2 9.0.0-preview.24454.1 @@ -67,7 +67,7 @@ 9.0.100-rc.2.24468.2 - 1.0.546701 + 1.0.546902 $(MicrosoftNETCoreApp31Version) From 43857685096b8a6ea9a8a9a78413ac00a63798fc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 24 Sep 2024 14:11:50 +0000 Subject: [PATCH 421/568] Update dependencies from https://github.com/dotnet/arcade build 20240923.1 (#7350) [feature/9.x] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- global.json | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e2de721be9e..5df4b025ca7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,25 +22,25 @@ https://github.com/dotnet/roslyn-analyzers a7c74cf887abe4a38240bc4ead0b221d9d42434f - + https://github.com/dotnet/arcade - 04b9022eba9c184a8036328af513c22e6949e8b6 + 1230437de1ab7b3e15fe7cdfe7ffce2f65449959 - + https://github.com/dotnet/arcade - 04b9022eba9c184a8036328af513c22e6949e8b6 + 1230437de1ab7b3e15fe7cdfe7ffce2f65449959 - + https://github.com/dotnet/arcade - 04b9022eba9c184a8036328af513c22e6949e8b6 + 1230437de1ab7b3e15fe7cdfe7ffce2f65449959 - + https://github.com/dotnet/arcade - 04b9022eba9c184a8036328af513c22e6949e8b6 + 1230437de1ab7b3e15fe7cdfe7ffce2f65449959 - + https://github.com/dotnet/arcade - 04b9022eba9c184a8036328af513c22e6949e8b6 + 1230437de1ab7b3e15fe7cdfe7ffce2f65449959 https://github.com/dotnet/diagnostics diff --git a/eng/Versions.props b/eng/Versions.props index 6b1b670ebe7..ccc490c5106 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,9 +48,9 @@ --> - 9.0.0-beta.24466.2 - 9.0.0-beta.24466.2 - 9.0.0-beta.24466.2 + 9.0.0-beta.24473.1 + 9.0.0-beta.24473.1 + 9.0.0-beta.24473.1 9.0.0-rtm.24466.12 9.0.0-rtm.24466.12 diff --git a/global.json b/global.json index 78446834ac7..239e56a0ea7 100644 --- a/global.json +++ b/global.json @@ -31,7 +31,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24466.2", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24466.2" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24473.1", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24473.1" } } From 5a52cef0538d6344392059321fa170ee958bd077 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 24 Sep 2024 14:50:33 +0000 Subject: [PATCH 422/568] Update dependencies from https://github.com/dotnet/sdk build 20240924.4 (#7352) [feature/9.x] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Runtime.win-x64: from 9.0.0-rtm.24466.12 to 9.0.0-rtm.24473.16 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) - Microsoft.NETCore.App.Runtime.win-x64: from 9.0.0-rc.2.24463.7 to 9.0.0-rtm.24473.2 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) - VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0: from 9.0.0-rtm.24466.12 to 9.0.0-rtm.24473.16 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) - VS.Redist.Common.NetCore.SharedFramework.x64.9.0: from 9.0.0-rc.2.24463.7 to 9.0.0-rtm.24473.2 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5df4b025ca7..6afe5fa0321 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/aspnetcore - 0d72ad5e4c5b1394e9708f47ed81e9748e4fd819 + 91ef755ae08f27b395d73be00d245d8095f90143 https://github.com/dotnet/diagnostics @@ -46,21 +46,21 @@ https://github.com/dotnet/diagnostics 37b70e07df52a98d08093565c574d423eff9e795 - + https://github.com/dotnet/runtime - 46cfb747b4c22471242dee0d106f5c79cf9fd4c5 + 3d9da91a9720f7bda3e4cef127b8195441fb2580 - + https://github.com/dotnet/aspnetcore - 0d72ad5e4c5b1394e9708f47ed81e9748e4fd819 + 91ef755ae08f27b395d73be00d245d8095f90143 - + https://github.com/dotnet/sdk - c204043de141a4d00ae5b4ec1b82aab67cccac1d + 42b2349ec272dbb8bbc5d8df29adb7b77e3450cd - + https://github.com/dotnet/runtime - 46cfb747b4c22471242dee0d106f5c79cf9fd4c5 + 3d9da91a9720f7bda3e4cef127b8195441fb2580 diff --git a/eng/Versions.props b/eng/Versions.props index ccc490c5106..45b5c0ddde9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,8 +52,8 @@ 9.0.0-beta.24473.1 9.0.0-beta.24473.1 - 9.0.0-rtm.24466.12 - 9.0.0-rtm.24466.12 + 9.0.0-rtm.24473.16 + 9.0.0-rtm.24473.16 2.0.0-beta4.24324.3 @@ -62,10 +62,10 @@ 9.0.0-preview.24454.1 - 9.0.0-rc.2.24463.7 - 9.0.0-rc.2.24463.7 + 9.0.0-rtm.24473.2 + 9.0.0-rtm.24473.2 - 9.0.100-rc.2.24468.2 + 9.0.100-rc.2.24474.4 1.0.546902 From c6c127970a2b8bfd4e32bd2fc0269b2140e12dc9 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 24 Sep 2024 08:48:48 -0700 Subject: [PATCH 423/568] [feature/9.x] Sync branch with origin/main (#7346) * Update dependencies from https://github.com/dotnet/diagnostics build 20240912.1 (#7317) [main] Update dependencies from dotnet/diagnostics * Update dependencies from https://github.com/dotnet/arcade build 20240911.2 (#7318) [main] Update dependencies from dotnet/arcade * Update releases information. (#7331) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * [main] Bump Azure.Core (#7321) Bumps the azure-sdk-dependencies group in /eng/dependabot/independent with 1 update: [Azure.Core](https://github.com/Azure/azure-sdk-for-net). Updates `Azure.Core` from 1.42.0 to 1.43.0 - [Release notes](https://github.com/Azure/azure-sdk-for-net/releases) - [Commits](https://github.com/Azure/azure-sdk-for-net/compare/Azure.Core_1.42.0...Azure.Core_1.43.0) --- updated-dependencies: - dependency-name: Azure.Core dependency-type: direct:production update-type: version-update:semver-minor dependency-group: azure-sdk-dependencies ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Update dependencies from https://github.com/dotnet/arcade build 20240913.3 (#7324) [main] Update dependencies from dotnet/arcade * Update dependencies from https://github.com/dotnet/diagnostics build 20240913.2 (#7323) [main] Update dependencies from dotnet/diagnostics - Merge branch 'main' into darc-main-3135f479-8138-4bc1-b2e1-74444d5c082f * Update dependencies from https://github.com/dotnet/diagnostics build 20240917.1 (#7334) [main] Update dependencies from dotnet/diagnostics * [main] Update dependencies from dotnet/diagnostics (#7337) * Update dependencies from https://github.com/dotnet/diagnostics build 20240918.2 Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe , Microsoft.FileFormats From Version 8.0.0-preview.24467.1 -> To Version 8.0.0-preview.24468.2 * Update dependencies from https://github.com/dotnet/diagnostics build 20240919.2 Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe , Microsoft.FileFormats From Version 8.0.0-preview.24468.2 -> To Version 8.0.0-preview.24469.2 --------- Co-authored-by: dotnet-maestro[bot] * [main] Bump the azure-sdk-dependencies group (#7339) Bumps the azure-sdk-dependencies group in /eng/dependabot/independent with 2 updates: [Azure.Storage.Blobs](https://github.com/Azure/azure-sdk-for-net) and [Azure.Storage.Queues](https://github.com/Azure/azure-sdk-for-net). Updates `Azure.Storage.Blobs` from 12.21.2 to 12.22.0 - [Release notes](https://github.com/Azure/azure-sdk-for-net/releases) - [Commits](https://github.com/Azure/azure-sdk-for-net/compare/Azure.Storage.Blobs_12.21.2...Azure.Storage.Blobs_12.22.0) Updates `Azure.Storage.Queues` from 12.19.1 to 12.20.0 - [Release notes](https://github.com/Azure/azure-sdk-for-net/releases) - [Commits](https://github.com/Azure/azure-sdk-for-net/compare/Azure.Storage.Queues_12.19.1...Azure.Storage.Queues_12.20.0) --- updated-dependencies: - dependency-name: Azure.Storage.Blobs dependency-type: direct:production update-type: version-update:semver-minor dependency-group: azure-sdk-dependencies - dependency-name: Azure.Storage.Queues dependency-type: direct:production update-type: version-update:semver-minor dependency-group: azure-sdk-dependencies ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --------- Signed-off-by: dependabot[bot] Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: dotnet-maestro[bot] --- .github/releases.json | 13 +------------ documentation/releases.md | 1 - eng/dependabot/independent/Versions.props | 6 +++--- 3 files changed, 4 insertions(+), 16 deletions(-) diff --git a/.github/releases.json b/.github/releases.json index 56527bd3268..6b5d97f4b7e 100644 --- a/.github/releases.json +++ b/.github/releases.json @@ -12,8 +12,7 @@ ], "unsupported": [ "7.3", - "7.2", - "7.1" + "7.2" ], "releases": { "6.3": { @@ -26,16 +25,6 @@ ], "outOfSupportDate": "2024-11-12T00:00:00.000Z" }, - "7.1": { - "tag": "v7.1.3", - "minorReleaseDate": "2023-03-14T00:00:00.000Z", - "patchReleaseDate": "2023-08-08T00:00:00.000Z", - "supportedFrameworks": [ - "net6.0", - "net7.0" - ], - "outOfSupportDate": "2023-09-13T00:00:00.000Z" - }, "8.0": { "tag": "v8.0.4", "minorReleaseDate": "2023-11-14T00:00:00.000Z", diff --git a/documentation/releases.md b/documentation/releases.md index 0c30b147e48..70c1556008a 100644 --- a/documentation/releases.md +++ b/documentation/releases.md @@ -14,7 +14,6 @@ | --- | --- | --- | --- | --- | --- | | 7.3 | August 8, 2023 | [7.3.4](https://github.com/dotnet/dotnet-monitor/releases/tag/v7.3.4) | May 14, 2024 | May 14, 2024 | net6.0
net7.0 | | 7.2 | June 13, 2023 | [7.2.3](https://github.com/dotnet/dotnet-monitor/releases/tag/v7.2.3) | October 10, 2023 | November 8, 2023 | net6.0
net7.0 | -| 7.1 | March 14, 2023 | [7.1.3](https://github.com/dotnet/dotnet-monitor/releases/tag/v7.1.3) | August 8, 2023 | September 13, 2023 | net6.0
net7.0 | ## Preview versions diff --git a/eng/dependabot/independent/Versions.props b/eng/dependabot/independent/Versions.props index 084f7698854..446b3d99ce9 100644 --- a/eng/dependabot/independent/Versions.props +++ b/eng/dependabot/independent/Versions.props @@ -2,10 +2,10 @@ - 1.42.0 + 1.43.0 1.12.0 - 12.21.2 - 12.19.1 + 12.22.0 + 12.20.0 3.1.0 1.6.21 4.3.2 From 0d250bb9d2db516c558067b5ce7f7ad710311c86 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 27 Sep 2024 09:59:06 -0700 Subject: [PATCH 424/568] [feature/9.x] Update dependencies from dotnet/sdk (#7361) * Update dependencies from https://github.com/dotnet/sdk build 20240925.4 VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0 From Version 9.0.100-rc.2.24474.4 -> To Version 9.0.100-rc.2.24475.4 Dependency coherency updates Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0 From Version 9.0.0-rtm.24473.16 -> To Version 9.0.0-rtm.24474.6 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0 * Update dependencies from https://github.com/dotnet/sdk build 20240927.4 VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0 From Version 9.0.100-rc.2.24475.4 -> To Version 9.0.100-rtm.24477.4 Dependency coherency updates Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0 From Version 9.0.0-rtm.24474.6 -> To Version 9.0.0-rtm.24476.2 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0 --------- Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6afe5fa0321..53f8a26df11 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/aspnetcore - 91ef755ae08f27b395d73be00d245d8095f90143 + f4895d974359d1ffded1dd3ab3a6c0eeda5f7fd8 https://github.com/dotnet/diagnostics @@ -46,21 +46,21 @@ https://github.com/dotnet/diagnostics 37b70e07df52a98d08093565c574d423eff9e795 - + https://github.com/dotnet/runtime - 3d9da91a9720f7bda3e4cef127b8195441fb2580 + 2c4266c134aa02718179818098a11e825c9d1362 - + https://github.com/dotnet/aspnetcore - 91ef755ae08f27b395d73be00d245d8095f90143 + f4895d974359d1ffded1dd3ab3a6c0eeda5f7fd8 - + https://github.com/dotnet/sdk - 42b2349ec272dbb8bbc5d8df29adb7b77e3450cd + 08c11ebdffa3086e9e342b91c0ee6efb9cda534b - + https://github.com/dotnet/runtime - 3d9da91a9720f7bda3e4cef127b8195441fb2580 + 2c4266c134aa02718179818098a11e825c9d1362 diff --git a/eng/Versions.props b/eng/Versions.props index 45b5c0ddde9..29519a26c99 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,8 +52,8 @@ 9.0.0-beta.24473.1 9.0.0-beta.24473.1 - 9.0.0-rtm.24473.16 - 9.0.0-rtm.24473.16 + 9.0.0-rtm.24476.2 + 9.0.0-rtm.24476.2 2.0.0-beta4.24324.3 @@ -62,10 +62,10 @@ 9.0.0-preview.24454.1 - 9.0.0-rtm.24473.2 - 9.0.0-rtm.24473.2 + 9.0.0-rtm.24475.3 + 9.0.0-rtm.24475.3 - 9.0.100-rc.2.24474.4 + 9.0.100-rtm.24477.4 1.0.546902 From a5437d2a88ecd6c962a6f2241b477e79ff6621f4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 27 Sep 2024 10:01:49 -0700 Subject: [PATCH 425/568] [feature/9.x] Update dependencies from dotnet/diagnostics (#7348) * Update dependencies from https://github.com/dotnet/diagnostics build 20240920.1 Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe , Microsoft.FileFormats From Version 8.0.0-preview.24469.2 -> To Version 8.0.0-preview.24470.1 * Update dependencies from https://github.com/dotnet/diagnostics build 20240923.2 Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe , Microsoft.FileFormats From Version 8.0.0-preview.24470.1 -> To Version 8.0.0-preview.24473.2 * Update dependencies from https://github.com/dotnet/diagnostics build 20240925.1 Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe , Microsoft.FileFormats From Version 8.0.0-preview.24473.2 -> To Version 8.0.0-preview.24475.1 * Update dependencies from https://github.com/dotnet/diagnostics build 20240926.1 Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe , Microsoft.FileFormats From Version 8.0.0-preview.24475.1 -> To Version 8.0.0-preview.24476.1 --------- Co-authored-by: dotnet-maestro[bot] Co-authored-by: Wiktor Kopec --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 53f8a26df11..6e43b56a8ac 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore f4895d974359d1ffded1dd3ab3a6c0eeda5f7fd8 - + https://github.com/dotnet/diagnostics - 37b70e07df52a98d08093565c574d423eff9e795 + b1a4c22a3107efae0238b9227e7b003580e755db - + https://github.com/dotnet/diagnostics - 37b70e07df52a98d08093565c574d423eff9e795 + b1a4c22a3107efae0238b9227e7b003580e755db https://github.com/dotnet/command-line-api @@ -42,9 +42,9 @@ https://github.com/dotnet/arcade 1230437de1ab7b3e15fe7cdfe7ffce2f65449959 - + https://github.com/dotnet/diagnostics - 37b70e07df52a98d08093565c574d423eff9e795 + b1a4c22a3107efae0238b9227e7b003580e755db https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 29519a26c99..e61affe2f72 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24324.3 - 8.0.0-preview.24469.2 - 8.0.0-preview.24469.2 + 8.0.0-preview.24476.1 + 8.0.0-preview.24476.1 9.0.0-preview.24454.1 @@ -67,7 +67,7 @@ 9.0.100-rtm.24477.4 - 1.0.546902 + 1.0.547601 $(MicrosoftNETCoreApp31Version) From 4eea8b13bf601299293dc997eae3ed52e6f26030 Mon Sep 17 00:00:00 2001 From: Joe Schmitt <1146681+schmittjoseph@users.noreply.github.com> Date: Fri, 27 Sep 2024 15:57:18 -0700 Subject: [PATCH 426/568] [feature/9.x] Require setting `TenantId` when configuring `AzureAd` authentication (#7365) --- documentation/schema.json | 10 +++---- .../AzureAdOptions.cs | 4 +-- .../AzureAdOptionsDefaults.cs | 1 - .../AzureAdOptionsExtensions.cs | 5 ---- .../OptionsDisplayStrings.Designer.cs | 2 +- .../OptionsDisplayStrings.resx | 4 +-- .../Options/AzureAdOptionsTests.cs | 27 +++++-------------- .../Auth/AzureAd/AzureAdAuthConfigurator.cs | 4 +-- 8 files changed, 18 insertions(+), 39 deletions(-) diff --git a/documentation/schema.json b/documentation/schema.json index 07f35a5ccb9..d671cb2a2f5 100644 --- a/documentation/schema.json +++ b/documentation/schema.json @@ -463,6 +463,7 @@ "type": "object", "additionalProperties": false, "required": [ + "TenantId", "ClientId", "RequiredRole" ], @@ -477,12 +478,9 @@ "default": "https://login.microsoftonline.com" }, "TenantId": { - "type": [ - "null", - "string" - ], - "description": "The tenant id of the Azure Active Directory tenant, or its tenant domain.", - "default": "organizations" + "type": "string", + "description": "The tenant id of the Azure Active Directory tenant.", + "minLength": 1 }, "ClientId": { "type": "string", diff --git a/src/Microsoft.Diagnostics.Monitoring.Options/AzureAdOptions.cs b/src/Microsoft.Diagnostics.Monitoring.Options/AzureAdOptions.cs index b40304057e1..dd8e6eecace 100644 --- a/src/Microsoft.Diagnostics.Monitoring.Options/AzureAdOptions.cs +++ b/src/Microsoft.Diagnostics.Monitoring.Options/AzureAdOptions.cs @@ -19,8 +19,8 @@ internal sealed partial class AzureAdOptions [Display( ResourceType = typeof(OptionsDisplayStrings), Description = nameof(OptionsDisplayStrings.DisplayAttributeDescription_AzureAdOptions_TenantId))] - [DefaultValue(AzureAdOptionsDefaults.DefaultTenantId)] - public string? TenantId { get; set; } + [Required] + public string TenantId { get; set; } = string.Empty; [Display( ResourceType = typeof(OptionsDisplayStrings), diff --git a/src/Microsoft.Diagnostics.Monitoring.Options/AzureAdOptionsDefaults.cs b/src/Microsoft.Diagnostics.Monitoring.Options/AzureAdOptionsDefaults.cs index 3b317d4a541..e0eb62cdf59 100644 --- a/src/Microsoft.Diagnostics.Monitoring.Options/AzureAdOptionsDefaults.cs +++ b/src/Microsoft.Diagnostics.Monitoring.Options/AzureAdOptionsDefaults.cs @@ -6,6 +6,5 @@ namespace Microsoft.Diagnostics.Tools.Monitor internal static class AzureAdOptionsDefaults { public const string DefaultInstance = "https://login.microsoftonline.com"; - public const string DefaultTenantId = "organizations"; } } diff --git a/src/Microsoft.Diagnostics.Monitoring.Options/AzureAdOptionsExtensions.cs b/src/Microsoft.Diagnostics.Monitoring.Options/AzureAdOptionsExtensions.cs index 4d8d178e8c9..6d33653f2ed 100644 --- a/src/Microsoft.Diagnostics.Monitoring.Options/AzureAdOptionsExtensions.cs +++ b/src/Microsoft.Diagnostics.Monitoring.Options/AzureAdOptionsExtensions.cs @@ -12,11 +12,6 @@ public static Uri GetInstance(this AzureAdOptions options) return options.Instance ?? new Uri(AzureAdOptionsDefaults.DefaultInstance); } - public static string GetTenantId(this AzureAdOptions options) - { - return options.TenantId ?? AzureAdOptionsDefaults.DefaultTenantId; - } - public static Uri GetAppIdUri(this AzureAdOptions options) { return options.AppIdUri ?? new Uri(FormattableString.Invariant($"api://{options.ClientId}")); diff --git a/src/Microsoft.Diagnostics.Monitoring.Options/OptionsDisplayStrings.Designer.cs b/src/Microsoft.Diagnostics.Monitoring.Options/OptionsDisplayStrings.Designer.cs index 4ec22b771fd..ca24a3f5feb 100644 --- a/src/Microsoft.Diagnostics.Monitoring.Options/OptionsDisplayStrings.Designer.cs +++ b/src/Microsoft.Diagnostics.Monitoring.Options/OptionsDisplayStrings.Designer.cs @@ -241,7 +241,7 @@ public static string DisplayAttributeDescription_AzureAdOptions_RequiredRole { } /// - /// Looks up a localized string similar to The tenant id of the Azure Active Directory tenant, or its tenant domain.. + /// Looks up a localized string similar to The tenant id of the Azure Active Directory tenant.. /// public static string DisplayAttributeDescription_AzureAdOptions_TenantId { get { diff --git a/src/Microsoft.Diagnostics.Monitoring.Options/OptionsDisplayStrings.resx b/src/Microsoft.Diagnostics.Monitoring.Options/OptionsDisplayStrings.resx index 23907f6752f..3156bbc0506 100644 --- a/src/Microsoft.Diagnostics.Monitoring.Options/OptionsDisplayStrings.resx +++ b/src/Microsoft.Diagnostics.Monitoring.Options/OptionsDisplayStrings.resx @@ -713,7 +713,7 @@ The description provided for the RequiredRole parameter on AzureAdOptions. - The tenant id of the Azure Active Directory tenant, or its tenant domain. + The tenant id of the Azure Active Directory tenant. The description provided for the TenantId parameter on AzureAdOptions. @@ -776,4 +776,4 @@ The name of the generated artifact. - + \ No newline at end of file diff --git a/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.UnitTests/Options/AzureAdOptionsTests.cs b/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.UnitTests/Options/AzureAdOptionsTests.cs index de14baa1939..95966d09f04 100644 --- a/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.UnitTests/Options/AzureAdOptionsTests.cs +++ b/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.UnitTests/Options/AzureAdOptionsTests.cs @@ -17,33 +17,19 @@ private static AzureAdOptions GetDefaultOptions() { return new AzureAdOptions { + TenantId = Guid.NewGuid().ToString("D"), ClientId = Guid.NewGuid().ToString("D"), RequiredRole = Guid.NewGuid().ToString("D") }; } [Fact] - public void AzureAdOptions_Supports_GuidTenantId() + public void AzureAdOptions_Requires_Role() { // Arrange AzureAdOptions options = GetDefaultOptions(); - options.TenantId = Guid.NewGuid().ToString("D"); - - List results = new(); - - // Act - bool isValid = Validator.TryValidateObject(options, new(options), results, validateAllProperties: true); - - // Assert - Assert.True(isValid); - } - [Fact] - public void AzureAdOptions_Supports_DomainTenantId() - { - // Arrange - AzureAdOptions options = GetDefaultOptions(); - options.TenantId = "common"; + options.RequiredRole = null; List results = new(); @@ -51,16 +37,17 @@ public void AzureAdOptions_Supports_DomainTenantId() bool isValid = Validator.TryValidateObject(options, new(options), results, validateAllProperties: true); // Assert - Assert.True(isValid); + Assert.False(isValid); + Assert.Single(results); } [Fact] - public void AzureAdOptions_Requires_Role() + public void AzureAdOptions_Requires_TenantId() { // Arrange AzureAdOptions options = GetDefaultOptions(); - options.RequiredRole = null; + options.TenantId = null; List results = new(); diff --git a/src/Tools/dotnet-monitor/Auth/AzureAd/AzureAdAuthConfigurator.cs b/src/Tools/dotnet-monitor/Auth/AzureAd/AzureAdAuthConfigurator.cs index c77ba1a45bf..45d42d7ab09 100644 --- a/src/Tools/dotnet-monitor/Auth/AzureAd/AzureAdAuthConfigurator.cs +++ b/src/Tools/dotnet-monitor/Auth/AzureAd/AzureAdAuthConfigurator.cs @@ -33,7 +33,7 @@ public void ConfigureApiAuth(IServiceCollection services, HostBuilderContext con configureMicrosoftIdentityOptions: options => { options.Instance = _azureAdOptions.GetInstance().ToString(); - options.TenantId = _azureAdOptions.GetTenantId(); + options.TenantId = _azureAdOptions.TenantId; options.ClientId = _azureAdOptions.ClientId; } ); @@ -51,7 +51,7 @@ public void ConfigureSwaggerGenAuth(SwaggerGenOptions options) { const string OAuth2SecurityDefinitionName = "OAuth2"; - Uri baseEndpoint = new Uri(_azureAdOptions.GetInstance(), FormattableString.Invariant($"{_azureAdOptions.GetTenantId()}/oauth2/v2.0/")); + Uri baseEndpoint = new Uri(_azureAdOptions.GetInstance(), FormattableString.Invariant($"{_azureAdOptions.TenantId}/oauth2/v2.0/")); options.AddSecurityDefinition(OAuth2SecurityDefinitionName, new OpenApiSecurityScheme { From dda69c7dfef663ca6d3a3ab017e304bddd7024c5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 28 Sep 2024 13:53:25 +0000 Subject: [PATCH 427/568] Update dependencies from https://github.com/dotnet/sdk build 20240927.19 (#7370) [feature/9.x] Update dependencies from dotnet/sdk --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6e43b56a8ac..64e22f1a5d6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,9 +54,9 @@ https://github.com/dotnet/aspnetcore f4895d974359d1ffded1dd3ab3a6c0eeda5f7fd8 - + https://github.com/dotnet/sdk - 08c11ebdffa3086e9e342b91c0ee6efb9cda534b + 34aa34113584307a040aed535522eefb5cda62a4 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index e61affe2f72..a82a2fe5066 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,7 +65,7 @@ 9.0.0-rtm.24475.3 9.0.0-rtm.24475.3 - 9.0.100-rtm.24477.4 + 9.0.100-rtm.24477.19 1.0.547601 From 31bff9bb8ca71da8cb7bb78ed4c77691dfda721c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 30 Sep 2024 17:00:45 -0700 Subject: [PATCH 428/568] [feature/9.x] Update dependencies from dotnet/sdk (#7374) * Update dependencies from https://github.com/dotnet/sdk build 20240928.4 VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0 From Version 9.0.100-rtm.24477.19 -> To Version 9.0.100-rtm.24478.4 Dependency coherency updates Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0 From Version 9.0.0-rtm.24476.2 -> To Version 9.0.0-rtm.24477.5 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0 * Update dependencies from https://github.com/dotnet/sdk build 20240929.2 VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0 From Version 9.0.100-rtm.24478.4 -> To Version 9.0.100-rtm.24479.2 --------- Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 64e22f1a5d6..a11fd27ee31 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/aspnetcore - f4895d974359d1ffded1dd3ab3a6c0eeda5f7fd8 + 9a34a6e3c7975f41300bd2550a089a85810cafd1 https://github.com/dotnet/diagnostics @@ -46,21 +46,21 @@ https://github.com/dotnet/diagnostics b1a4c22a3107efae0238b9227e7b003580e755db - + https://github.com/dotnet/runtime - 2c4266c134aa02718179818098a11e825c9d1362 + 0d44aea3696bab80b11a12c6bdfdbf8de9c4e815 - + https://github.com/dotnet/aspnetcore - f4895d974359d1ffded1dd3ab3a6c0eeda5f7fd8 + 9a34a6e3c7975f41300bd2550a089a85810cafd1 - + https://github.com/dotnet/sdk - 34aa34113584307a040aed535522eefb5cda62a4 + 4b64dad734c5b0915dedc223fe3ae8429345313b - + https://github.com/dotnet/runtime - 2c4266c134aa02718179818098a11e825c9d1362 + 0d44aea3696bab80b11a12c6bdfdbf8de9c4e815 diff --git a/eng/Versions.props b/eng/Versions.props index a82a2fe5066..10792e8f33f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,8 +52,8 @@ 9.0.0-beta.24473.1 9.0.0-beta.24473.1 - 9.0.0-rtm.24476.2 - 9.0.0-rtm.24476.2 + 9.0.0-rtm.24477.5 + 9.0.0-rtm.24477.5 2.0.0-beta4.24324.3 @@ -62,10 +62,10 @@ 9.0.0-preview.24454.1 - 9.0.0-rtm.24475.3 - 9.0.0-rtm.24475.3 + 9.0.0-rtm.24476.4 + 9.0.0-rtm.24476.4 - 9.0.100-rtm.24477.19 + 9.0.100-rtm.24479.2 1.0.547601 From c86e3beb78a3204ebb60b6527d729b9ed4a5a675 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 30 Sep 2024 17:01:07 -0700 Subject: [PATCH 429/568] Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20240929.1 (#7373) Microsoft.CodeAnalysis.NetAnalyzers From Version 9.0.0-preview.24454.1 -> To Version 9.0.0-preview.24479.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a11fd27ee31..e39ba7599e6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -18,9 +18,9 @@ - + https://github.com/dotnet/roslyn-analyzers - a7c74cf887abe4a38240bc4ead0b221d9d42434f + 2595aeb5e9a506f3f845c01be18d70ded045e33a https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 10792e8f33f..53d19d29f6c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -60,7 +60,7 @@ 8.0.0-preview.24476.1 8.0.0-preview.24476.1 - 9.0.0-preview.24454.1 + 9.0.0-preview.24479.1 9.0.0-rtm.24476.4 9.0.0-rtm.24476.4 From 49fa8af82acbfc858234cfa564073b2656c4054e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 1 Oct 2024 09:09:39 -0700 Subject: [PATCH 430/568] [feature/9.x] Update dependencies from dotnet/diagnostics (#7372) * Update dependencies from https://github.com/dotnet/diagnostics build 20240927.1 Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe , Microsoft.FileFormats From Version 8.0.0-preview.24476.1 -> To Version 8.0.0-preview.24477.1 * Update dependencies from https://github.com/dotnet/diagnostics build 20240929.1 Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe , Microsoft.FileFormats From Version 8.0.0-preview.24477.1 -> To Version 8.0.0-preview.24479.1 --------- Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e39ba7599e6..74e33654179 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore 9a34a6e3c7975f41300bd2550a089a85810cafd1 - + https://github.com/dotnet/diagnostics - b1a4c22a3107efae0238b9227e7b003580e755db + 8227c4f39865220c1e80b18b6a7fd8fe3d8e4546 - + https://github.com/dotnet/diagnostics - b1a4c22a3107efae0238b9227e7b003580e755db + 8227c4f39865220c1e80b18b6a7fd8fe3d8e4546 https://github.com/dotnet/command-line-api @@ -42,9 +42,9 @@ https://github.com/dotnet/arcade 1230437de1ab7b3e15fe7cdfe7ffce2f65449959 - + https://github.com/dotnet/diagnostics - b1a4c22a3107efae0238b9227e7b003580e755db + 8227c4f39865220c1e80b18b6a7fd8fe3d8e4546 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 53d19d29f6c..b2ee6d6e1f9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24324.3 - 8.0.0-preview.24476.1 - 8.0.0-preview.24476.1 + 8.0.0-preview.24479.1 + 8.0.0-preview.24479.1 9.0.0-preview.24479.1 @@ -67,7 +67,7 @@ 9.0.100-rtm.24479.2 - 1.0.547601 + 1.0.547901 $(MicrosoftNETCoreApp31Version) From 3d660c533d16d57e0d2205dde2846078ad6144f7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 1 Oct 2024 16:37:39 +0000 Subject: [PATCH 431/568] Update dependencies from https://github.com/dotnet/sdk build 20240930.4 (#7381) [feature/9.x] Update dependencies from dotnet/sdk --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 74e33654179..5914598311c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,9 +54,9 @@ https://github.com/dotnet/aspnetcore 9a34a6e3c7975f41300bd2550a089a85810cafd1 - + https://github.com/dotnet/sdk - 4b64dad734c5b0915dedc223fe3ae8429345313b + 944f573d75d29c5825364f305a45760624ad3eb3 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index b2ee6d6e1f9..e25ccf47218 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,7 +65,7 @@ 9.0.0-rtm.24476.4 9.0.0-rtm.24476.4 - 9.0.100-rtm.24479.2 + 9.0.100-rtm.24480.4 1.0.547901 From d55c57222ca89ebbb98d01e4633de0abf7a9241e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 2 Oct 2024 14:18:05 +0000 Subject: [PATCH 432/568] Update dependencies from https://github.com/dotnet/arcade build 20241001.3 (#7384) [feature/9.x] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- global.json | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5914598311c..44f65d5e58d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,25 +22,25 @@ https://github.com/dotnet/roslyn-analyzers 2595aeb5e9a506f3f845c01be18d70ded045e33a - + https://github.com/dotnet/arcade - 1230437de1ab7b3e15fe7cdfe7ffce2f65449959 + e879259c14f58a55983b9a70dd3034cc650ee961 - + https://github.com/dotnet/arcade - 1230437de1ab7b3e15fe7cdfe7ffce2f65449959 + e879259c14f58a55983b9a70dd3034cc650ee961 - + https://github.com/dotnet/arcade - 1230437de1ab7b3e15fe7cdfe7ffce2f65449959 + e879259c14f58a55983b9a70dd3034cc650ee961 - + https://github.com/dotnet/arcade - 1230437de1ab7b3e15fe7cdfe7ffce2f65449959 + e879259c14f58a55983b9a70dd3034cc650ee961 - + https://github.com/dotnet/arcade - 1230437de1ab7b3e15fe7cdfe7ffce2f65449959 + e879259c14f58a55983b9a70dd3034cc650ee961 https://github.com/dotnet/diagnostics diff --git a/eng/Versions.props b/eng/Versions.props index e25ccf47218..d2baf361102 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,9 +48,9 @@ --> - 9.0.0-beta.24473.1 - 9.0.0-beta.24473.1 - 9.0.0-beta.24473.1 + 9.0.0-beta.24501.3 + 9.0.0-beta.24501.3 + 9.0.0-beta.24501.3 9.0.0-rtm.24477.5 9.0.0-rtm.24477.5 diff --git a/global.json b/global.json index 239e56a0ea7..3e5e2ab5b45 100644 --- a/global.json +++ b/global.json @@ -31,7 +31,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24473.1", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24473.1" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24501.3", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24501.3" } } From 48c920dbeee1f67c00ef986aa48bcaa06fc4933f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 2 Oct 2024 14:27:38 +0000 Subject: [PATCH 433/568] Update dependencies from https://github.com/dotnet/sdk build 20241001.2 (#7385) [feature/9.x] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NETCore.App.Runtime.win-x64: from 9.0.0-rtm.24476.4 to 9.0.0-rtm.24480.7 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) - VS.Redist.Common.NetCore.SharedFramework.x64.9.0: from 9.0.0-rtm.24476.4 to 9.0.0-rtm.24480.7 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 44f65d5e58d..74bd473751c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -46,21 +46,21 @@ https://github.com/dotnet/diagnostics 8227c4f39865220c1e80b18b6a7fd8fe3d8e4546 - + https://github.com/dotnet/runtime - 0d44aea3696bab80b11a12c6bdfdbf8de9c4e815 + 3d3a8ed3d52deed5d9eb4391aaead0d462f58caa https://github.com/dotnet/aspnetcore 9a34a6e3c7975f41300bd2550a089a85810cafd1 - + https://github.com/dotnet/sdk - 944f573d75d29c5825364f305a45760624ad3eb3 + 27be3c7235d8a1dba0df17a28a2077b2263fcb43 - + https://github.com/dotnet/runtime - 0d44aea3696bab80b11a12c6bdfdbf8de9c4e815 + 3d3a8ed3d52deed5d9eb4391aaead0d462f58caa diff --git a/eng/Versions.props b/eng/Versions.props index d2baf361102..0eec0c38ff4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -62,10 +62,10 @@ 9.0.0-preview.24479.1 - 9.0.0-rtm.24476.4 - 9.0.0-rtm.24476.4 + 9.0.0-rtm.24480.7 + 9.0.0-rtm.24480.7 - 9.0.100-rtm.24480.4 + 9.0.100-rtm.24501.2 1.0.547901 From 538a487c3ea819934c97f80c7cf8b12d2c657f16 Mon Sep 17 00:00:00 2001 From: Wiktor Kopec Date: Wed, 2 Oct 2024 22:17:11 -0700 Subject: [PATCH 434/568] Update System.Text.Json version --- eng/dependabot/independent/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/dependabot/independent/Versions.props b/eng/dependabot/independent/Versions.props index 73c538e70c5..15f6157317f 100644 --- a/eng/dependabot/independent/Versions.props +++ b/eng/dependabot/independent/Versions.props @@ -10,7 +10,7 @@ 1.6.22 4.3.2 5.0.0 - 8.0.4 + 9.0.0 13.0.3 From d36b52bb38e1f9e81b898e322d02ae0bf869429a Mon Sep 17 00:00:00 2001 From: Wiktor Kopec Date: Wed, 2 Oct 2024 22:25:52 -0700 Subject: [PATCH 435/568] Update System.Text.Json version to rc1 --- eng/dependabot/independent/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/dependabot/independent/Versions.props b/eng/dependabot/independent/Versions.props index 15f6157317f..a53facd6766 100644 --- a/eng/dependabot/independent/Versions.props +++ b/eng/dependabot/independent/Versions.props @@ -10,7 +10,7 @@ 1.6.22 4.3.2 5.0.0 - 9.0.0 + 9.0.0-rc.1.24431.7 13.0.3 From 0eb305196ce155c5ef42dbfd0cf9bb8aa0b1e7b9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2024 13:56:34 +0000 Subject: [PATCH 436/568] Update dependencies from https://github.com/dotnet/sdk build 20241002.22 (#7406) [feature/9.x] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NETCore.App.Runtime.win-x64: from 9.0.0-rtm.24480.7 to 9.0.0-rtm.24501.6 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) - VS.Redist.Common.NetCore.SharedFramework.x64.9.0: from 9.0.0-rtm.24480.7 to 9.0.0-rtm.24501.6 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 74bd473751c..78143845f3e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -46,21 +46,21 @@ https://github.com/dotnet/diagnostics 8227c4f39865220c1e80b18b6a7fd8fe3d8e4546 - + https://github.com/dotnet/runtime - 3d3a8ed3d52deed5d9eb4391aaead0d462f58caa + 58801184a1f0300d193517a77a054f51752aa3b2 https://github.com/dotnet/aspnetcore 9a34a6e3c7975f41300bd2550a089a85810cafd1 - + https://github.com/dotnet/sdk - 27be3c7235d8a1dba0df17a28a2077b2263fcb43 + 3c5b89fabedba77188c0e24ee48437e547e9ee8b - + https://github.com/dotnet/runtime - 3d3a8ed3d52deed5d9eb4391aaead0d462f58caa + 58801184a1f0300d193517a77a054f51752aa3b2 diff --git a/eng/Versions.props b/eng/Versions.props index 0eec0c38ff4..a0b395d5e65 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -62,10 +62,10 @@ 9.0.0-preview.24479.1 - 9.0.0-rtm.24480.7 - 9.0.0-rtm.24480.7 + 9.0.0-rtm.24501.6 + 9.0.0-rtm.24501.6 - 9.0.100-rtm.24501.2 + 9.0.100-rtm.24502.22 1.0.547901 From 4f46c81f667272b49a3b41ea4026eb35f48b4acc Mon Sep 17 00:00:00 2001 From: Wiktor Kopec Date: Thu, 3 Oct 2024 10:14:07 -0700 Subject: [PATCH 437/568] Split 8.0 and 9.0 STJ --- eng/Versions.props | 3 +++ eng/dependabot/Versions.props | 1 + eng/dependabot/independent/Packages.props | 1 - eng/dependabot/independent/Versions.props | 1 - eng/dependabot/net8.0/Packages.props | 1 + eng/dependabot/net8.0/Versions.props | 1 + eng/dependabot/net9.0/Directory.Build.props | 5 +++++ eng/dependabot/net9.0/NuGet.config | 1 + eng/dependabot/net9.0/Packages.props | 8 ++++++++ eng/dependabot/net9.0/Versions.props | 6 ++++++ eng/dependabot/net9.0/dependabot.csproj | 6 ++++++ 11 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 eng/dependabot/net9.0/Directory.Build.props create mode 100644 eng/dependabot/net9.0/NuGet.config create mode 100644 eng/dependabot/net9.0/Packages.props create mode 100644 eng/dependabot/net9.0/Versions.props create mode 100644 eng/dependabot/net9.0/dependabot.csproj diff --git a/eng/Versions.props b/eng/Versions.props index 0eec0c38ff4..24bf3741acb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -96,6 +96,7 @@ $(MicrosoftExtensionsLogging60Version) $(MicrosoftExtensionsLoggingAbstractions60Version) $(MicrosoftExtensionsLoggingConsole60Version) + $(SystemTextJson80Version) $(MicrosoftAspNetCoreApp70Version) @@ -111,6 +112,7 @@ $(MicrosoftExtensionsLogging80Version) $(MicrosoftExtensionsLoggingAbstractions80Version) $(MicrosoftExtensionsLoggingConsole80Version) + $(SystemTextJson80Version) $(MicrosoftAspNetCoreApp90Version) @@ -119,6 +121,7 @@ $(MicrosoftNETCoreApp90Version) $(MicrosoftNETCoreApp90Version) $(MicrosoftNETCoreApp90Version) + $(SystemTextJson90Version) $(MicrosoftDiagnosticsMonitoringShippedVersion) diff --git a/eng/dependabot/Versions.props b/eng/dependabot/Versions.props index 4ce9f25830e..6bd4dac8dc1 100644 --- a/eng/dependabot/Versions.props +++ b/eng/dependabot/Versions.props @@ -4,5 +4,6 @@ + diff --git a/eng/dependabot/independent/Packages.props b/eng/dependabot/independent/Packages.props index edc3cfcb0f0..b9dd3e73d89 100644 --- a/eng/dependabot/independent/Packages.props +++ b/eng/dependabot/independent/Packages.props @@ -11,7 +11,6 @@ - diff --git a/eng/dependabot/independent/Versions.props b/eng/dependabot/independent/Versions.props index a53facd6766..28966c8cf14 100644 --- a/eng/dependabot/independent/Versions.props +++ b/eng/dependabot/independent/Versions.props @@ -10,7 +10,6 @@ 1.6.22 4.3.2 5.0.0 - 9.0.0-rc.1.24431.7 13.0.3 diff --git a/eng/dependabot/net8.0/Packages.props b/eng/dependabot/net8.0/Packages.props index c0b69ea13ce..2943b192b67 100644 --- a/eng/dependabot/net8.0/Packages.props +++ b/eng/dependabot/net8.0/Packages.props @@ -13,5 +13,6 @@ with the same version number. --> + + + + diff --git a/eng/dependabot/net9.0/NuGet.config b/eng/dependabot/net9.0/NuGet.config new file mode 100644 index 00000000000..941555881f8 --- /dev/null +++ b/eng/dependabot/net9.0/NuGet.config @@ -0,0 +1 @@ +../../../NuGet.config \ No newline at end of file diff --git a/eng/dependabot/net9.0/Packages.props b/eng/dependabot/net9.0/Packages.props new file mode 100644 index 00000000000..328b64a4664 --- /dev/null +++ b/eng/dependabot/net9.0/Packages.props @@ -0,0 +1,8 @@ + + + + + + net9.0 + + From 4a8baf4bd1068e8390522cec61538bd1cecb03fa Mon Sep 17 00:00:00 2001 From: Wiktor Kopec Date: Thu, 3 Oct 2024 10:19:25 -0700 Subject: [PATCH 438/568] Update eng/dependabot/net8.0/Versions.props Co-authored-by: Justin Anderson --- eng/dependabot/net8.0/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/dependabot/net8.0/Versions.props b/eng/dependabot/net8.0/Versions.props index 5488044f82d..a034a83518a 100644 --- a/eng/dependabot/net8.0/Versions.props +++ b/eng/dependabot/net8.0/Versions.props @@ -11,6 +11,6 @@ 8.0.0 8.0.8 - 8.0.4 + 8.0.4 From 5cab98afebda184aa616069be858322a133c41b0 Mon Sep 17 00:00:00 2001 From: Wiktor Kopec Date: Thu, 3 Oct 2024 11:17:47 -0700 Subject: [PATCH 439/568] Fixup 7.0 build --- eng/Versions.props | 1 + 1 file changed, 1 insertion(+) diff --git a/eng/Versions.props b/eng/Versions.props index 24bf3741acb..65ab06bf632 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -104,6 +104,7 @@ $(MicrosoftExtensionsLogging70Version) $(MicrosoftExtensionsLoggingAbstractions70Version) $(MicrosoftExtensionsLoggingConsole70Version) + $(SystemTextJson80Version) $(MicrosoftAspNetCoreApp80Version) From 531ff0ea85c8ad93e4ffeb638230d8c1d7205fab Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 4 Oct 2024 14:18:14 +0000 Subject: [PATCH 440/568] Update dependencies from https://github.com/dotnet/diagnostics build 20241003.2 (#7417) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 78143845f3e..c4364b8aa5d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore 9a34a6e3c7975f41300bd2550a089a85810cafd1 - + https://github.com/dotnet/diagnostics - 8227c4f39865220c1e80b18b6a7fd8fe3d8e4546 + 46cd690d9ee1fa140854980d429079675d4dc08a - + https://github.com/dotnet/diagnostics - 8227c4f39865220c1e80b18b6a7fd8fe3d8e4546 + 46cd690d9ee1fa140854980d429079675d4dc08a https://github.com/dotnet/command-line-api @@ -42,9 +42,9 @@ https://github.com/dotnet/arcade e879259c14f58a55983b9a70dd3034cc650ee961 - + https://github.com/dotnet/diagnostics - 8227c4f39865220c1e80b18b6a7fd8fe3d8e4546 + 46cd690d9ee1fa140854980d429079675d4dc08a https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 285e26afb3e..78959119c40 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24324.3 - 8.0.0-preview.24479.1 - 8.0.0-preview.24479.1 + 8.0.0-preview.24503.2 + 8.0.0-preview.24503.2 9.0.0-preview.24479.1 @@ -67,7 +67,7 @@ 9.0.100-rtm.24502.22 - 1.0.547901 + 1.0.550302 $(MicrosoftNETCoreApp31Version) From c9736d7040d66d2b2e4123b36f463c845463544a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 4 Oct 2024 14:26:19 +0000 Subject: [PATCH 441/568] Update dependencies from https://github.com/dotnet/sdk build 20241004.1 (#7418) [feature/9.x] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Runtime.win-x64: from 9.0.0-rtm.24477.5 to 9.0.0-rtm.24501.7 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) - VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0: from 9.0.0-rtm.24477.5 to 9.0.0-rtm.24501.7 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c4364b8aa5d..34e012f8347 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/aspnetcore - 9a34a6e3c7975f41300bd2550a089a85810cafd1 + 9d5458536b0e28996570b0ebbb1c2dbc5afedf56 https://github.com/dotnet/diagnostics @@ -50,13 +50,13 @@ https://github.com/dotnet/runtime 58801184a1f0300d193517a77a054f51752aa3b2 - + https://github.com/dotnet/aspnetcore - 9a34a6e3c7975f41300bd2550a089a85810cafd1 + 9d5458536b0e28996570b0ebbb1c2dbc5afedf56 - + https://github.com/dotnet/sdk - 3c5b89fabedba77188c0e24ee48437e547e9ee8b + 400deebe954609bb60ba2855f87e9816e4f0620e https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 78959119c40..6b53cac1190 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,8 +52,8 @@ 9.0.0-beta.24501.3 9.0.0-beta.24501.3 - 9.0.0-rtm.24477.5 - 9.0.0-rtm.24477.5 + 9.0.0-rtm.24501.7 + 9.0.0-rtm.24501.7 2.0.0-beta4.24324.3 @@ -65,7 +65,7 @@ 9.0.0-rtm.24501.6 9.0.0-rtm.24501.6 - 9.0.100-rtm.24502.22 + 9.0.100-rtm.24504.1 1.0.550302 From 4d0df49acbd101534f93a7e1fdee117c3e8635bd Mon Sep 17 00:00:00 2001 From: Justin Anderson Date: Fri, 4 Oct 2024 09:00:12 -0700 Subject: [PATCH 442/568] Remove CBL Mariner helix queue (#7415) --- eng/helix/Helix.proj | 4 ---- 1 file changed, 4 deletions(-) diff --git a/eng/helix/Helix.proj b/eng/helix/Helix.proj index c1876382bf8..63c33fcb30d 100644 --- a/eng/helix/Helix.proj +++ b/eng/helix/Helix.proj @@ -79,10 +79,6 @@ Condition="'$(HelixArchitecture)' == 'x64'"> Debian 12 $(HelixArchitecture) $(HelixConfiguration) - - Mariner 2.0 $(HelixArchitecture) $(HelixConfiguration) - Ubuntu 20.04 $(HelixArchitecture) $(HelixConfiguration) From aeb6f8773980d4eb72cf6117f4782ca29db85da3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 5 Oct 2024 13:51:49 +0000 Subject: [PATCH 443/568] Update dependencies from https://github.com/dotnet/diagnostics build 20241004.1 (#7431) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 34e012f8347..a76f841a6ff 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore 9d5458536b0e28996570b0ebbb1c2dbc5afedf56 - + https://github.com/dotnet/diagnostics - 46cd690d9ee1fa140854980d429079675d4dc08a + 05952324eacf997b7fe209bf056d9c9305160f39 - + https://github.com/dotnet/diagnostics - 46cd690d9ee1fa140854980d429079675d4dc08a + 05952324eacf997b7fe209bf056d9c9305160f39 https://github.com/dotnet/command-line-api @@ -42,9 +42,9 @@ https://github.com/dotnet/arcade e879259c14f58a55983b9a70dd3034cc650ee961 - + https://github.com/dotnet/diagnostics - 46cd690d9ee1fa140854980d429079675d4dc08a + 05952324eacf997b7fe209bf056d9c9305160f39 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 6b53cac1190..1cb9b823adc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24324.3 - 8.0.0-preview.24503.2 - 8.0.0-preview.24503.2 + 8.0.0-preview.24504.1 + 8.0.0-preview.24504.1 9.0.0-preview.24479.1 @@ -67,7 +67,7 @@ 9.0.100-rtm.24504.1 - 1.0.550302 + 1.0.550401 $(MicrosoftNETCoreApp31Version) From 919db353f1fde113f0b60c4547e8b2d1e999f6fc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 5 Oct 2024 13:53:47 +0000 Subject: [PATCH 444/568] Update dependencies from https://github.com/dotnet/arcade build 20241003.2 (#7432) [feature/9.x] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- eng/common/templates-official/job/job.yml | 1 + eng/common/templates/job/job.yml | 1 + global.json | 4 ++-- 5 files changed, 17 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a76f841a6ff..ee3f31fab1a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,25 +22,25 @@ https://github.com/dotnet/roslyn-analyzers 2595aeb5e9a506f3f845c01be18d70ded045e33a - + https://github.com/dotnet/arcade - e879259c14f58a55983b9a70dd3034cc650ee961 + beb827ded6acdff8c7333dfc6583cc984a8f2620 - + https://github.com/dotnet/arcade - e879259c14f58a55983b9a70dd3034cc650ee961 + beb827ded6acdff8c7333dfc6583cc984a8f2620 - + https://github.com/dotnet/arcade - e879259c14f58a55983b9a70dd3034cc650ee961 + beb827ded6acdff8c7333dfc6583cc984a8f2620 - + https://github.com/dotnet/arcade - e879259c14f58a55983b9a70dd3034cc650ee961 + beb827ded6acdff8c7333dfc6583cc984a8f2620 - + https://github.com/dotnet/arcade - e879259c14f58a55983b9a70dd3034cc650ee961 + beb827ded6acdff8c7333dfc6583cc984a8f2620 https://github.com/dotnet/diagnostics diff --git a/eng/Versions.props b/eng/Versions.props index 1cb9b823adc..82c37c889f4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,9 +48,9 @@ --> - 9.0.0-beta.24501.3 - 9.0.0-beta.24501.3 - 9.0.0-beta.24501.3 + 9.0.0-beta.24503.2 + 9.0.0-beta.24503.2 + 9.0.0-beta.24503.2 9.0.0-rtm.24501.7 9.0.0-rtm.24501.7 diff --git a/eng/common/templates-official/job/job.yml b/eng/common/templates-official/job/job.yml index 3d16b41c78c..605692d2fb7 100644 --- a/eng/common/templates-official/job/job.yml +++ b/eng/common/templates-official/job/job.yml @@ -1,6 +1,7 @@ parameters: # Sbom related params enableSbom: true + runAsPublic: false PackageVersion: 9.0.0 BuildDropPath: '$(Build.SourcesDirectory)/artifacts' diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index 07d317bf8f9..d1aeb92fcea 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -4,6 +4,7 @@ parameters: componentGovernanceIgnoreDirectories: '' # Sbom related params enableSbom: true + runAsPublic: false PackageVersion: 9.0.0 BuildDropPath: '$(Build.SourcesDirectory)/artifacts' diff --git a/global.json b/global.json index 3e5e2ab5b45..ef0c4a1ca4d 100644 --- a/global.json +++ b/global.json @@ -31,7 +31,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24501.3", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24501.3" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24503.2", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24503.2" } } From 70c44dfb0f75e622c6c9a45b4845d0821afcf5f7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 5 Oct 2024 13:55:13 +0000 Subject: [PATCH 445/568] Update dependencies from https://github.com/dotnet/sdk build 20241004.15 (#7433) [feature/9.x] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NETCore.App.Runtime.win-x64: from 9.0.0-rtm.24501.6 to 9.0.0-rtm.24503.8 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) - VS.Redist.Common.NetCore.SharedFramework.x64.9.0: from 9.0.0-rtm.24501.6 to 9.0.0-rtm.24503.8 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ee3f31fab1a..d8fb0428f8a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -46,21 +46,21 @@ https://github.com/dotnet/diagnostics 05952324eacf997b7fe209bf056d9c9305160f39 - + https://github.com/dotnet/runtime - 58801184a1f0300d193517a77a054f51752aa3b2 + 3429fee9ed58213a8916e1e2aa921fda6ba24aa2 https://github.com/dotnet/aspnetcore 9d5458536b0e28996570b0ebbb1c2dbc5afedf56 - + https://github.com/dotnet/sdk - 400deebe954609bb60ba2855f87e9816e4f0620e + 6a7f86a90566a15439ae0332f17e50cf34c21c3a - + https://github.com/dotnet/runtime - 58801184a1f0300d193517a77a054f51752aa3b2 + 3429fee9ed58213a8916e1e2aa921fda6ba24aa2 diff --git a/eng/Versions.props b/eng/Versions.props index 82c37c889f4..d2a80e3129f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -62,10 +62,10 @@ 9.0.0-preview.24479.1 - 9.0.0-rtm.24501.6 - 9.0.0-rtm.24501.6 + 9.0.0-rtm.24503.8 + 9.0.0-rtm.24503.8 - 9.0.100-rtm.24504.1 + 9.0.100-rtm.24504.15 1.0.550401 From a887fa6c565ef418253755919deae0301e950d88 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 8 Oct 2024 13:43:51 +0000 Subject: [PATCH 446/568] Update dependencies from https://github.com/dotnet/sdk build 20241008.6 (#7444) [feature/9.x] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Runtime.win-x64: from 9.0.0-rtm.24501.7 to 9.0.0-rtm.24507.7 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) - VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0: from 9.0.0-rtm.24501.7 to 9.0.0-rtm.24507.7 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d8fb0428f8a..f705262da31 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/aspnetcore - 9d5458536b0e28996570b0ebbb1c2dbc5afedf56 + 99135af51fa200682ecfc585011eaba907dea4ba https://github.com/dotnet/diagnostics @@ -50,13 +50,13 @@ https://github.com/dotnet/runtime 3429fee9ed58213a8916e1e2aa921fda6ba24aa2 - + https://github.com/dotnet/aspnetcore - 9d5458536b0e28996570b0ebbb1c2dbc5afedf56 + 99135af51fa200682ecfc585011eaba907dea4ba - + https://github.com/dotnet/sdk - 6a7f86a90566a15439ae0332f17e50cf34c21c3a + 6e797f2ce68f1a715ed1b2f9ab04b671d8497f39 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index d2a80e3129f..61605164630 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,8 +52,8 @@ 9.0.0-beta.24503.2 9.0.0-beta.24503.2 - 9.0.0-rtm.24501.7 - 9.0.0-rtm.24501.7 + 9.0.0-rtm.24507.7 + 9.0.0-rtm.24507.7 2.0.0-beta4.24324.3 @@ -65,7 +65,7 @@ 9.0.0-rtm.24503.8 9.0.0-rtm.24503.8 - 9.0.100-rtm.24504.15 + 9.0.100-rtm.24508.6 1.0.550401 From 198b27881cb079817961f630b95afcedacd17738 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 8 Oct 2024 13:53:03 +0000 Subject: [PATCH 447/568] Update dependencies from https://github.com/dotnet/diagnostics build 20241007.1 (#7442) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f705262da31..b90ca5b06a1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore 99135af51fa200682ecfc585011eaba907dea4ba - + https://github.com/dotnet/diagnostics - 05952324eacf997b7fe209bf056d9c9305160f39 + 412c0e46f9db6cabc3123d77cc2cfcbc5d9f133a - + https://github.com/dotnet/diagnostics - 05952324eacf997b7fe209bf056d9c9305160f39 + 412c0e46f9db6cabc3123d77cc2cfcbc5d9f133a https://github.com/dotnet/command-line-api @@ -42,9 +42,9 @@ https://github.com/dotnet/arcade beb827ded6acdff8c7333dfc6583cc984a8f2620 - + https://github.com/dotnet/diagnostics - 05952324eacf997b7fe209bf056d9c9305160f39 + 412c0e46f9db6cabc3123d77cc2cfcbc5d9f133a https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 61605164630..955d577914e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24324.3 - 8.0.0-preview.24504.1 - 8.0.0-preview.24504.1 + 8.0.0-preview.24507.1 + 8.0.0-preview.24507.1 9.0.0-preview.24479.1 @@ -67,7 +67,7 @@ 9.0.100-rtm.24508.6 - 1.0.550401 + 1.0.550701 $(MicrosoftNETCoreApp31Version) From 9a9131ee04396737c9208c2cc23c768b88f7a573 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 8 Oct 2024 20:48:10 +0000 Subject: [PATCH 448/568] Update version to 9.0.0 rtm (#7453) --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 955d577914e..abcef22270e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -4,8 +4,8 @@ https://github.com/dotnet/dotnet-monitor 9.0.0 - rc - 2 + rtm + release true 2.0.0-beta4.24324.3 - 8.0.0-preview.24507.1 - 8.0.0-preview.24507.1 + 8.0.0-preview.24508.1 + 8.0.0-preview.24508.1 9.0.0-preview.24479.1 @@ -67,7 +67,7 @@ 9.0.100-rtm.24508.6 - 1.0.550701 + 1.0.550801 $(MicrosoftNETCoreApp31Version) From bd45ad247b63ff2cba3cd25bddf58e379bf72caf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 9 Oct 2024 13:56:38 -0700 Subject: [PATCH 450/568] Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20241008.2 (#7456) Microsoft.CodeAnalysis.NetAnalyzers From Version 9.0.0-preview.24479.1 -> To Version 9.0.0-preview.24508.2 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fe6d80ca579..6cec84a768b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -18,9 +18,9 @@ - + https://github.com/dotnet/roslyn-analyzers - 2595aeb5e9a506f3f845c01be18d70ded045e33a + 3d61c57c73c3dd5f1f407ef9cd3414d94bf0eaf2 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 00850ddef39..1ab3ee2414b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -60,7 +60,7 @@ 8.0.0-preview.24508.1 8.0.0-preview.24508.1 - 9.0.0-preview.24479.1 + 9.0.0-preview.24508.2 9.0.0-rtm.24503.8 9.0.0-rtm.24503.8 From adfd7e8b42bc83e239235ec7a3da1a917c455d33 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 9 Oct 2024 21:24:45 +0000 Subject: [PATCH 451/568] Update dependencies from https://github.com/dotnet/sdk build 20241009.3 (#7457) [feature/9.x] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Runtime.win-x64: from 9.0.0-rtm.24507.7 to 9.0.0-rtm.24508.22 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) - VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0: from 9.0.0-rtm.24507.7 to 9.0.0-rtm.24508.22 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6cec84a768b..f5d1d0d5f11 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/aspnetcore - 99135af51fa200682ecfc585011eaba907dea4ba + 9f57b1ed7a4adab022ec5d227723f23862aad0e3 https://github.com/dotnet/diagnostics @@ -50,13 +50,13 @@ https://github.com/dotnet/runtime 3429fee9ed58213a8916e1e2aa921fda6ba24aa2 - + https://github.com/dotnet/aspnetcore - 99135af51fa200682ecfc585011eaba907dea4ba + 9f57b1ed7a4adab022ec5d227723f23862aad0e3 - + https://github.com/dotnet/sdk - 6e797f2ce68f1a715ed1b2f9ab04b671d8497f39 + e6060a147facbaded6673bf64a265bc665b05389 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 1ab3ee2414b..482a7ecb451 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,8 +52,8 @@ 9.0.0-beta.24503.2 9.0.0-beta.24503.2 - 9.0.0-rtm.24507.7 - 9.0.0-rtm.24507.7 + 9.0.0-rtm.24508.22 + 9.0.0-rtm.24508.22 2.0.0-beta4.24324.3 @@ -65,7 +65,7 @@ 9.0.0-rtm.24503.8 9.0.0-rtm.24503.8 - 9.0.100-rtm.24508.6 + 9.0.100-rtm.24509.3 1.0.550801 From 3e6c1f3c66aca7f53cfde72cb9f1deeb33f40779 Mon Sep 17 00:00:00 2001 From: Justin Anderson Date: Wed, 9 Oct 2024 20:39:08 -0700 Subject: [PATCH 452/568] SDK Update (#7481) --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index ef0c4a1ca4d..e4362bf2357 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "9.0.100-rc.1.24452.12", + "dotnet": "9.0.100-rc.2.24474.11", "runtimes": { "aspnetcore": [ "$(MicrosoftAspNetCoreApp60Version)", From f07f9b1b2bdfce94b8809ac77f8b028bce1cd3c0 Mon Sep 17 00:00:00 2001 From: Justin Anderson Date: Thu, 10 Oct 2024 09:55:02 -0700 Subject: [PATCH 453/568] Fix .NET 9 dependabot updates (#7479) --- .github/dependabot.template.yml | 2 + .github/dependabot.yml | 97 ++++++++++++++++++++++++++++ eng/dependabot/net9.0/Packages.props | 2 +- 3 files changed, 100 insertions(+), 1 deletion(-) diff --git a/.github/dependabot.template.yml b/.github/dependabot.template.yml index 636bd598bb6..749547109ac 100644 --- a/.github/dependabot.template.yml +++ b/.github/dependabot.template.yml @@ -8,6 +8,7 @@ #! to the list of TFMs that the major version uses for build and test. #@ def getTfms(): #@ return { +#@ "9": [ "net9.0", "net8.0", "net7.0", "net6.0" ], #@ "8": [ "net8.0", "net7.0", "net6.0" ], #@ "6": [ "net6.0", "netcoreapp3.1" ] #@ } @@ -18,6 +19,7 @@ #@ def getBranches(): #@ return [ #@ struct.encode({"name": "main", "majorVersion": "8"}), +#@ struct.encode({"name": "feature/9.x", "majorVersion": "9"}), #@ struct.encode({"name": "release/8.0", "majorVersion": "8"}), #@ struct.encode({"name": "release/6.x", "majorVersion": "6"}), #@ ] diff --git a/.github/dependabot.yml b/.github/dependabot.yml index e6efff14ffa..ca31b0ba295 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -85,6 +85,103 @@ updates: - Microsoft.Extensions.* - Microsoft.NETCore.DotNetHost - System.Text.Json +- package-ecosystem: nuget + directory: /eng/dependabot/independent + schedule: + interval: daily + target-branch: feature/9.x + ignore: + - dependency-name: Microsoft.Extensions.* + update-types: + - version-update:semver-major + - dependency-name: Moq + commit-message: + prefix: '[feature/9.x] ' + groups: + azure-sdk-dependencies: + patterns: + - Azure.Core + - Azure.Identity + - Azure.Storage.* + identity-dependencies: + patterns: + - Microsoft.Identity.* + - Microsoft.IdentityModel.* +- package-ecosystem: nuget + directory: /eng/dependabot/nuget.org + schedule: + interval: daily + target-branch: feature/9.x + commit-message: + prefix: '[feature/9.x] ' +- package-ecosystem: nuget + directory: /eng/dependabot/net9.0 + schedule: + interval: daily + target-branch: feature/9.x + ignore: + - dependency-name: '*' + update-types: + - version-update:semver-major + commit-message: + prefix: '[feature/9.x] ' + groups: + runtime-dependencies: + patterns: + - Microsoft.Extensions.* + - Microsoft.NETCore.DotNetHost + - System.Text.Json +- package-ecosystem: nuget + directory: /eng/dependabot/net8.0 + schedule: + interval: daily + target-branch: feature/9.x + ignore: + - dependency-name: '*' + update-types: + - version-update:semver-major + commit-message: + prefix: '[feature/9.x] ' + groups: + runtime-dependencies: + patterns: + - Microsoft.Extensions.* + - Microsoft.NETCore.DotNetHost + - System.Text.Json +- package-ecosystem: nuget + directory: /eng/dependabot/net7.0 + schedule: + interval: daily + target-branch: feature/9.x + ignore: + - dependency-name: '*' + update-types: + - version-update:semver-major + commit-message: + prefix: '[feature/9.x] ' + groups: + runtime-dependencies: + patterns: + - Microsoft.Extensions.* + - Microsoft.NETCore.DotNetHost + - System.Text.Json +- package-ecosystem: nuget + directory: /eng/dependabot/net6.0 + schedule: + interval: daily + target-branch: feature/9.x + ignore: + - dependency-name: '*' + update-types: + - version-update:semver-major + commit-message: + prefix: '[feature/9.x] ' + groups: + runtime-dependencies: + patterns: + - Microsoft.Extensions.* + - Microsoft.NETCore.DotNetHost + - System.Text.Json - package-ecosystem: nuget directory: /eng/dependabot/independent schedule: diff --git a/eng/dependabot/net9.0/Packages.props b/eng/dependabot/net9.0/Packages.props index 328b64a4664..f0df732d795 100644 --- a/eng/dependabot/net9.0/Packages.props +++ b/eng/dependabot/net9.0/Packages.props @@ -3,6 +3,6 @@ Packages in this file have versions updated periodically by Dependabot specifically for .NET 9. --> - From 896d9f1a567d16ae8d2ce8b43d94d21d4f68036e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 14 Oct 2024 09:00:30 -0700 Subject: [PATCH 454/568] [feature/9.x] Update dependencies from dotnet/sdk (#7490) * Update dependencies from https://github.com/dotnet/sdk build 20241009.30 VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0 From Version 9.0.100-rtm.24509.3 -> To Version 9.0.100-rtm.24509.30 * Update dependencies from https://github.com/dotnet/sdk build 20241012.1 VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0 From Version 9.0.100-rtm.24509.30 -> To Version 9.0.100-rtm.24512.1 Dependency coherency updates Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0 From Version 9.0.0-rtm.24508.22 -> To Version 9.0.0-rtm.24511.11 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0 --------- Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f5d1d0d5f11..6a62a370ac8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/aspnetcore - 9f57b1ed7a4adab022ec5d227723f23862aad0e3 + 00eeceef992c85130b5137ceaba8b54c172b432d https://github.com/dotnet/diagnostics @@ -46,21 +46,21 @@ https://github.com/dotnet/diagnostics b1a304482e20a62afdb28ba4b2c92ad5dec558cd - + https://github.com/dotnet/runtime - 3429fee9ed58213a8916e1e2aa921fda6ba24aa2 + 226c0347b92c4f9649bcc7ad580f74cb0409580e - + https://github.com/dotnet/aspnetcore - 9f57b1ed7a4adab022ec5d227723f23862aad0e3 + 00eeceef992c85130b5137ceaba8b54c172b432d - + https://github.com/dotnet/sdk - e6060a147facbaded6673bf64a265bc665b05389 + 5b9d9d4677ea31d954533e9de2f95a3ea638135d - + https://github.com/dotnet/runtime - 3429fee9ed58213a8916e1e2aa921fda6ba24aa2 + 226c0347b92c4f9649bcc7ad580f74cb0409580e diff --git a/eng/Versions.props b/eng/Versions.props index 482a7ecb451..198092ee3db 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,8 +52,8 @@ 9.0.0-beta.24503.2 9.0.0-beta.24503.2 - 9.0.0-rtm.24508.22 - 9.0.0-rtm.24508.22 + 9.0.0-rtm.24511.11 + 9.0.0-rtm.24511.11 2.0.0-beta4.24324.3 @@ -62,10 +62,10 @@ 9.0.0-preview.24508.2 - 9.0.0-rtm.24503.8 - 9.0.0-rtm.24503.8 + 9.0.0-rtm.24510.3 + 9.0.0-rtm.24510.3 - 9.0.100-rtm.24509.3 + 9.0.100-rtm.24512.1 1.0.550801 From 1b8aa6c25849d4812df24868424ad22b86ab2abd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 14 Oct 2024 09:00:46 -0700 Subject: [PATCH 455/568] [feature/9.x] Update dependencies from dotnet/arcade (#7488) * Update dependencies from https://github.com/dotnet/arcade build 20241008.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.24503.2 -> To Version 9.0.0-beta.24508.3 * Update dependencies from https://github.com/dotnet/arcade build 20241009.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.24508.3 -> To Version 9.0.0-beta.24509.3 --------- Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- eng/common/tools.ps1 | 2 +- global.json | 4 ++-- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6a62a370ac8..5451226e079 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,25 +22,25 @@ https://github.com/dotnet/roslyn-analyzers 3d61c57c73c3dd5f1f407ef9cd3414d94bf0eaf2 - + https://github.com/dotnet/arcade - beb827ded6acdff8c7333dfc6583cc984a8f2620 + 05c72bb3c9b38138276a8029017f2ef905dcc7fa - + https://github.com/dotnet/arcade - beb827ded6acdff8c7333dfc6583cc984a8f2620 + 05c72bb3c9b38138276a8029017f2ef905dcc7fa - + https://github.com/dotnet/arcade - beb827ded6acdff8c7333dfc6583cc984a8f2620 + 05c72bb3c9b38138276a8029017f2ef905dcc7fa - + https://github.com/dotnet/arcade - beb827ded6acdff8c7333dfc6583cc984a8f2620 + 05c72bb3c9b38138276a8029017f2ef905dcc7fa - + https://github.com/dotnet/arcade - beb827ded6acdff8c7333dfc6583cc984a8f2620 + 05c72bb3c9b38138276a8029017f2ef905dcc7fa https://github.com/dotnet/diagnostics diff --git a/eng/Versions.props b/eng/Versions.props index 198092ee3db..0c186708228 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,9 +48,9 @@ --> - 9.0.0-beta.24503.2 - 9.0.0-beta.24503.2 - 9.0.0-beta.24503.2 + 9.0.0-beta.24509.3 + 9.0.0-beta.24509.3 + 9.0.0-beta.24509.3 9.0.0-rtm.24511.11 9.0.0-rtm.24511.11 diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 9574f4eb9df..22954477a57 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -900,7 +900,7 @@ function IsWindowsPlatform() { } function Get-Darc($version) { - $darcPath = "$TempDir\darc\$(New-Guid)" + $darcPath = "$TempDir\darc\$([guid]::NewGuid())" if ($version -ne $null) { & $PSScriptRoot\darc-init.ps1 -toolpath $darcPath -darcVersion $version | Out-Host } else { diff --git a/global.json b/global.json index e4362bf2357..0cfc93527a7 100644 --- a/global.json +++ b/global.json @@ -31,7 +31,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24503.2", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24503.2" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24509.3", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24509.3" } } From 8062628e631ce5f2a5922a2304cbacb85084d7f5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 14 Oct 2024 16:52:59 +0000 Subject: [PATCH 456/568] [feature/9.x] Bump the azure-sdk-dependencies group (#7501) Bumps the azure-sdk-dependencies group in /eng/dependabot/independent with 3 updates: [Azure.Core](https://github.com/Azure/azure-sdk-for-net), [Azure.Storage.Blobs](https://github.com/Azure/azure-sdk-for-net) and [Azure.Storage.Queues](https://github.com/Azure/azure-sdk-for-net). Updates `Azure.Core` from 1.44.0 to 1.44.1 - [Release notes](https://github.com/Azure/azure-sdk-for-net/releases) - [Commits](https://github.com/Azure/azure-sdk-for-net/compare/Azure.Core_1.44.0...Azure.Core_1.44.1) Updates `Azure.Storage.Blobs` from 12.22.1 to 12.22.2 - [Release notes](https://github.com/Azure/azure-sdk-for-net/releases) - [Commits](https://github.com/Azure/azure-sdk-for-net/compare/Azure.Storage.Blobs_12.22.1...Azure.Storage.Blobs_12.22.2) Updates `Azure.Core` from 1.44.0 to 1.44.1 - [Release notes](https://github.com/Azure/azure-sdk-for-net/releases) - [Commits](https://github.com/Azure/azure-sdk-for-net/compare/Azure.Core_1.44.0...Azure.Core_1.44.1) Updates `Azure.Storage.Queues` from 12.20.0 to 12.20.1 - [Release notes](https://github.com/Azure/azure-sdk-for-net/releases) - [Commits](https://github.com/Azure/azure-sdk-for-net/compare/Azure.Storage.Queues_12.20.0...Azure.Storage.Queues_12.20.1) Updates `Azure.Core` from 1.44.0 to 1.44.1 - [Release notes](https://github.com/Azure/azure-sdk-for-net/releases) - [Commits](https://github.com/Azure/azure-sdk-for-net/compare/Azure.Core_1.44.0...Azure.Core_1.44.1) --- updated-dependencies: - dependency-name: Azure.Core dependency-type: direct:production update-type: version-update:semver-patch dependency-group: azure-sdk-dependencies - dependency-name: Azure.Storage.Blobs dependency-type: direct:production update-type: version-update:semver-patch dependency-group: azure-sdk-dependencies - dependency-name: Azure.Core dependency-type: direct:production update-type: version-update:semver-patch dependency-group: azure-sdk-dependencies - dependency-name: Azure.Storage.Queues dependency-type: direct:production update-type: version-update:semver-patch dependency-group: azure-sdk-dependencies - dependency-name: Azure.Core dependency-type: direct:production update-type: version-update:semver-patch dependency-group: azure-sdk-dependencies ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- eng/dependabot/independent/Versions.props | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/dependabot/independent/Versions.props b/eng/dependabot/independent/Versions.props index 8793a65234d..488aa62b725 100644 --- a/eng/dependabot/independent/Versions.props +++ b/eng/dependabot/independent/Versions.props @@ -2,10 +2,10 @@ - 1.44.0 + 1.44.1 1.12.1 - 12.22.1 - 12.20.0 + 12.22.2 + 12.20.1 3.2.2 1.6.22 4.3.2 From c60ed75866e3074c5c2a85f1484628338fc06c02 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 15 Oct 2024 19:33:10 +0000 Subject: [PATCH 457/568] Update dependencies from https://github.com/dotnet/diagnostics build 20241014.1 (#7506) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5451226e079..f980729d2fd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore 00eeceef992c85130b5137ceaba8b54c172b432d - + https://github.com/dotnet/diagnostics - b1a304482e20a62afdb28ba4b2c92ad5dec558cd + 5d515de41617781be12ae71b60bccd7982d34dbd - + https://github.com/dotnet/diagnostics - b1a304482e20a62afdb28ba4b2c92ad5dec558cd + 5d515de41617781be12ae71b60bccd7982d34dbd https://github.com/dotnet/command-line-api @@ -42,9 +42,9 @@ https://github.com/dotnet/arcade 05c72bb3c9b38138276a8029017f2ef905dcc7fa - + https://github.com/dotnet/diagnostics - b1a304482e20a62afdb28ba4b2c92ad5dec558cd + 5d515de41617781be12ae71b60bccd7982d34dbd https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 0c186708228..9564255444e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24324.3 - 8.0.0-preview.24508.1 - 8.0.0-preview.24508.1 + 8.0.0-preview.24514.1 + 8.0.0-preview.24514.1 9.0.0-preview.24508.2 @@ -67,7 +67,7 @@ 9.0.100-rtm.24512.1 - 1.0.550801 + 1.0.551401 $(MicrosoftNETCoreApp31Version) From ee6f14a8f801f2e554b3a964ef54085890a501c9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 15 Oct 2024 23:28:36 +0000 Subject: [PATCH 458/568] [feature/9.x] Bump Azure.Identity (#7510) Bumps the azure-sdk-dependencies group in /eng/dependabot/independent with 1 update: [Azure.Identity](https://github.com/Azure/azure-sdk-for-net). Updates `Azure.Identity` from 1.12.1 to 1.13.0 - [Release notes](https://github.com/Azure/azure-sdk-for-net/releases) - [Commits](https://github.com/Azure/azure-sdk-for-net/compare/Azure.Identity_1.12.1...Azure.Identity_1.13.0) --- updated-dependencies: - dependency-name: Azure.Identity dependency-type: direct:production update-type: version-update:semver-minor dependency-group: azure-sdk-dependencies ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- eng/dependabot/independent/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/dependabot/independent/Versions.props b/eng/dependabot/independent/Versions.props index 488aa62b725..09070bd620f 100644 --- a/eng/dependabot/independent/Versions.props +++ b/eng/dependabot/independent/Versions.props @@ -3,7 +3,7 @@ 1.44.1 - 1.12.1 + 1.13.0 12.22.2 12.20.1 3.2.2 From 7885704c61c8b2a0f53e3690f7025c5e67ba06d1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 15 Oct 2024 23:46:18 +0000 Subject: [PATCH 459/568] Update dependencies from https://github.com/dotnet/sdk build 20241014.22 (#7507) [feature/9.x] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Runtime.win-x64: from 9.0.0-rtm.24511.11 to 9.0.0-rtm.24514.7 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) - Microsoft.NETCore.App.Runtime.win-x64: from 9.0.0-rtm.24510.3 to 9.0.0-rtm.24511.16 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) - VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0: from 9.0.0-rtm.24511.11 to 9.0.0-rtm.24514.7 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) - VS.Redist.Common.NetCore.SharedFramework.x64.9.0: from 9.0.0-rtm.24510.3 to 9.0.0-rtm.24511.16 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f980729d2fd..296944fab9d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/aspnetcore - 00eeceef992c85130b5137ceaba8b54c172b432d + 228b9ea237f21b19647f11c98e342efdb9a1f3f1 https://github.com/dotnet/diagnostics @@ -46,21 +46,21 @@ https://github.com/dotnet/diagnostics 5d515de41617781be12ae71b60bccd7982d34dbd - + https://github.com/dotnet/runtime - 226c0347b92c4f9649bcc7ad580f74cb0409580e + b030c4dfdfa1bf287f10f96006619a06bc2000ae - + https://github.com/dotnet/aspnetcore - 00eeceef992c85130b5137ceaba8b54c172b432d + 228b9ea237f21b19647f11c98e342efdb9a1f3f1 - + https://github.com/dotnet/sdk - 5b9d9d4677ea31d954533e9de2f95a3ea638135d + 0009da1479d71f7c69ba5ae8e4d0e91ef2f7e6eb - + https://github.com/dotnet/runtime - 226c0347b92c4f9649bcc7ad580f74cb0409580e + b030c4dfdfa1bf287f10f96006619a06bc2000ae diff --git a/eng/Versions.props b/eng/Versions.props index 9564255444e..426177d297f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,8 +52,8 @@ 9.0.0-beta.24509.3 9.0.0-beta.24509.3 - 9.0.0-rtm.24511.11 - 9.0.0-rtm.24511.11 + 9.0.0-rtm.24514.7 + 9.0.0-rtm.24514.7 2.0.0-beta4.24324.3 @@ -62,10 +62,10 @@ 9.0.0-preview.24508.2 - 9.0.0-rtm.24510.3 - 9.0.0-rtm.24510.3 + 9.0.0-rtm.24511.16 + 9.0.0-rtm.24511.16 - 9.0.100-rtm.24512.1 + 9.0.100-rtm.24514.22 1.0.551401 From 39fa3a1c9a5125473963acff0f9a855ab8befc6c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 16 Oct 2024 14:06:57 +0000 Subject: [PATCH 460/568] Update dependencies from https://github.com/dotnet/sdk build 20241016.6 (#7516) [feature/9.x] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NETCore.App.Runtime.win-x64: from 9.0.0-rtm.24511.16 to 9.0.0-rtm.24515.9 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) - VS.Redist.Common.NetCore.SharedFramework.x64.9.0: from 9.0.0-rtm.24511.16 to 9.0.0-rtm.24515.9 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 296944fab9d..422a08bd28f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -46,21 +46,21 @@ https://github.com/dotnet/diagnostics 5d515de41617781be12ae71b60bccd7982d34dbd - + https://github.com/dotnet/runtime - b030c4dfdfa1bf287f10f96006619a06bc2000ae + cf1c582931dc647b8e6ca58c34fcfb20d5d07a42 https://github.com/dotnet/aspnetcore 228b9ea237f21b19647f11c98e342efdb9a1f3f1 - + https://github.com/dotnet/sdk - 0009da1479d71f7c69ba5ae8e4d0e91ef2f7e6eb + 3aa4e4a78d5256d91514bef17eb5ebe3dce6743a - + https://github.com/dotnet/runtime - b030c4dfdfa1bf287f10f96006619a06bc2000ae + cf1c582931dc647b8e6ca58c34fcfb20d5d07a42 diff --git a/eng/Versions.props b/eng/Versions.props index 426177d297f..2b5d1380afb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -62,10 +62,10 @@ 9.0.0-preview.24508.2 - 9.0.0-rtm.24511.16 - 9.0.0-rtm.24511.16 + 9.0.0-rtm.24515.9 + 9.0.0-rtm.24515.9 - 9.0.100-rtm.24514.22 + 9.0.100-rtm.24516.6 1.0.551401 From 7b705006a8e65e0baf5d53518838d92e1507eb7c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 16 Oct 2024 14:08:22 +0000 Subject: [PATCH 461/568] Update dependencies from https://github.com/dotnet/diagnostics build 20241015.1 (#7515) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 422a08bd28f..384d9e63284 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore 228b9ea237f21b19647f11c98e342efdb9a1f3f1 - + https://github.com/dotnet/diagnostics - 5d515de41617781be12ae71b60bccd7982d34dbd + 5902d0830c3df827673346c4a756ba80f923a83f - + https://github.com/dotnet/diagnostics - 5d515de41617781be12ae71b60bccd7982d34dbd + 5902d0830c3df827673346c4a756ba80f923a83f https://github.com/dotnet/command-line-api @@ -42,9 +42,9 @@ https://github.com/dotnet/arcade 05c72bb3c9b38138276a8029017f2ef905dcc7fa - + https://github.com/dotnet/diagnostics - 5d515de41617781be12ae71b60bccd7982d34dbd + 5902d0830c3df827673346c4a756ba80f923a83f https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 2b5d1380afb..caad3fe8ee0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24324.3 - 8.0.0-preview.24514.1 - 8.0.0-preview.24514.1 + 8.0.0-preview.24515.1 + 8.0.0-preview.24515.1 9.0.0-preview.24508.2 @@ -67,7 +67,7 @@ 9.0.100-rtm.24516.6 - 1.0.551401 + 1.0.551501 $(MicrosoftNETCoreApp31Version) From 7e1a354bc7d11f0cd871be655745d2b241838e79 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 16 Oct 2024 22:54:27 +0000 Subject: [PATCH 462/568] Update dependencies from https://github.com/dotnet/arcade build 20241016.2 (#7519) [feature/9.x] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 +++++++++---------- eng/Versions.props | 6 +++--- .../steps/get-delegation-sas.yml | 11 +++++++++- global.json | 4 ++-- 4 files changed, 25 insertions(+), 16 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 384d9e63284..f33e6d43423 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,25 +22,25 @@ https://github.com/dotnet/roslyn-analyzers 3d61c57c73c3dd5f1f407ef9cd3414d94bf0eaf2 - + https://github.com/dotnet/arcade - 05c72bb3c9b38138276a8029017f2ef905dcc7fa + 3c393bbd85ae16ddddba20d0b75035b0c6f1a52d - + https://github.com/dotnet/arcade - 05c72bb3c9b38138276a8029017f2ef905dcc7fa + 3c393bbd85ae16ddddba20d0b75035b0c6f1a52d - + https://github.com/dotnet/arcade - 05c72bb3c9b38138276a8029017f2ef905dcc7fa + 3c393bbd85ae16ddddba20d0b75035b0c6f1a52d - + https://github.com/dotnet/arcade - 05c72bb3c9b38138276a8029017f2ef905dcc7fa + 3c393bbd85ae16ddddba20d0b75035b0c6f1a52d - + https://github.com/dotnet/arcade - 05c72bb3c9b38138276a8029017f2ef905dcc7fa + 3c393bbd85ae16ddddba20d0b75035b0c6f1a52d https://github.com/dotnet/diagnostics diff --git a/eng/Versions.props b/eng/Versions.props index caad3fe8ee0..763e277bc6e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,9 +48,9 @@ --> - 9.0.0-beta.24509.3 - 9.0.0-beta.24509.3 - 9.0.0-beta.24509.3 + 9.0.0-beta.24516.2 + 9.0.0-beta.24516.2 + 9.0.0-beta.24516.2 9.0.0-rtm.24514.7 9.0.0-rtm.24514.7 diff --git a/eng/common/core-templates/steps/get-delegation-sas.yml b/eng/common/core-templates/steps/get-delegation-sas.yml index d2901470a7f..9db5617ea7d 100644 --- a/eng/common/core-templates/steps/get-delegation-sas.yml +++ b/eng/common/core-templates/steps/get-delegation-sas.yml @@ -31,7 +31,16 @@ steps: # Calculate the expiration of the SAS token and convert to UTC $expiry = (Get-Date).AddHours(${{ parameters.expiryInHours }}).ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ssZ") - $sas = az storage container generate-sas --account-name ${{ parameters.storageAccount }} --name ${{ parameters.container }} --permissions ${{ parameters.permissions }} --expiry $expiry --auth-mode login --as-user -o tsv + # Temporarily work around a helix issue where SAS tokens with / in them will cause incorrect downloads + # of correlation payloads. https://github.com/dotnet/dnceng/issues/3484 + $sas = "" + do { + $sas = az storage container generate-sas --account-name ${{ parameters.storageAccount }} --name ${{ parameters.container }} --permissions ${{ parameters.permissions }} --expiry $expiry --auth-mode login --as-user -o tsv + if ($LASTEXITCODE -ne 0) { + Write-Error "Failed to generate SAS token." + exit 1 + } + } while($sas.IndexOf('/') -ne -1) if ($LASTEXITCODE -ne 0) { Write-Error "Failed to generate SAS token." diff --git a/global.json b/global.json index 0cfc93527a7..2c0f1518455 100644 --- a/global.json +++ b/global.json @@ -31,7 +31,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24509.3", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24509.3" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24516.2", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24516.2" } } From 1a14d80da5358376cb44a0b10258a81978ef5f2b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 17 Oct 2024 14:07:13 +0000 Subject: [PATCH 463/568] Update dependencies from https://github.com/dotnet/diagnostics build 20241016.1 (#7522) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f33e6d43423..2a749619dc4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore 228b9ea237f21b19647f11c98e342efdb9a1f3f1 - + https://github.com/dotnet/diagnostics - 5902d0830c3df827673346c4a756ba80f923a83f + 2c736aae9387f481959ff835e1401b655f897255 - + https://github.com/dotnet/diagnostics - 5902d0830c3df827673346c4a756ba80f923a83f + 2c736aae9387f481959ff835e1401b655f897255 https://github.com/dotnet/command-line-api @@ -42,9 +42,9 @@ https://github.com/dotnet/arcade 3c393bbd85ae16ddddba20d0b75035b0c6f1a52d - + https://github.com/dotnet/diagnostics - 5902d0830c3df827673346c4a756ba80f923a83f + 2c736aae9387f481959ff835e1401b655f897255 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 763e277bc6e..ae64c82708c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24324.3 - 8.0.0-preview.24515.1 - 8.0.0-preview.24515.1 + 8.0.0-preview.24516.1 + 8.0.0-preview.24516.1 9.0.0-preview.24508.2 @@ -67,7 +67,7 @@ 9.0.100-rtm.24516.6 - 1.0.551501 + 1.0.551601 $(MicrosoftNETCoreApp31Version) From 8216d1f2718cd2bd561ebab29cab18bb81f4b966 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 18 Oct 2024 13:13:59 +0000 Subject: [PATCH 464/568] Update dependencies from https://github.com/dotnet/diagnostics build 20241017.2 (#7527) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2a749619dc4..69f0fba8c13 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore 228b9ea237f21b19647f11c98e342efdb9a1f3f1 - + https://github.com/dotnet/diagnostics - 2c736aae9387f481959ff835e1401b655f897255 + 6a90923439dc43693f2a2fc8766b3cdb2c4dd366 - + https://github.com/dotnet/diagnostics - 2c736aae9387f481959ff835e1401b655f897255 + 6a90923439dc43693f2a2fc8766b3cdb2c4dd366 https://github.com/dotnet/command-line-api @@ -42,9 +42,9 @@ https://github.com/dotnet/arcade 3c393bbd85ae16ddddba20d0b75035b0c6f1a52d - + https://github.com/dotnet/diagnostics - 2c736aae9387f481959ff835e1401b655f897255 + 6a90923439dc43693f2a2fc8766b3cdb2c4dd366 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index ae64c82708c..0e432d89071 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24324.3 - 8.0.0-preview.24516.1 - 8.0.0-preview.24516.1 + 8.0.0-preview.24517.2 + 8.0.0-preview.24517.2 9.0.0-preview.24508.2 @@ -67,7 +67,7 @@ 9.0.100-rtm.24516.6 - 1.0.551601 + 1.0.551702 $(MicrosoftNETCoreApp31Version) From 1fb1c649350a57eb47a022c85d53e2cdad3c7ad3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 19 Oct 2024 13:09:17 +0000 Subject: [PATCH 465/568] Update dependencies from https://github.com/dotnet/diagnostics build 20241018.1 (#7534) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 6 +++--- eng/Versions.props | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 69f0fba8c13..cd3dd913483 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,11 +4,11 @@ https://github.com/dotnet/aspnetcore 228b9ea237f21b19647f11c98e342efdb9a1f3f1 - + https://github.com/dotnet/diagnostics 6a90923439dc43693f2a2fc8766b3cdb2c4dd366 - + https://github.com/dotnet/diagnostics 6a90923439dc43693f2a2fc8766b3cdb2c4dd366 @@ -42,7 +42,7 @@ https://github.com/dotnet/arcade 3c393bbd85ae16ddddba20d0b75035b0c6f1a52d - + https://github.com/dotnet/diagnostics 6a90923439dc43693f2a2fc8766b3cdb2c4dd366 diff --git a/eng/Versions.props b/eng/Versions.props index 0e432d89071..39967e22b39 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24324.3 - 8.0.0-preview.24517.2 - 8.0.0-preview.24517.2 + 8.0.0-preview.24518.1 + 8.0.0-preview.24518.1 9.0.0-preview.24508.2 @@ -67,7 +67,7 @@ 9.0.100-rtm.24516.6 - 1.0.551702 + 1.0.551801 $(MicrosoftNETCoreApp31Version) From 4b1d17fa1aadc0335a02e37575409663aad908b5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 20 Oct 2024 13:13:10 +0000 Subject: [PATCH 466/568] Update dependencies from https://github.com/dotnet/diagnostics build 20241019.1 (#7536) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 6 +++--- eng/Versions.props | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cd3dd913483..1a7a94e224f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,11 +4,11 @@ https://github.com/dotnet/aspnetcore 228b9ea237f21b19647f11c98e342efdb9a1f3f1 - + https://github.com/dotnet/diagnostics 6a90923439dc43693f2a2fc8766b3cdb2c4dd366 - + https://github.com/dotnet/diagnostics 6a90923439dc43693f2a2fc8766b3cdb2c4dd366 @@ -42,7 +42,7 @@ https://github.com/dotnet/arcade 3c393bbd85ae16ddddba20d0b75035b0c6f1a52d - + https://github.com/dotnet/diagnostics 6a90923439dc43693f2a2fc8766b3cdb2c4dd366 diff --git a/eng/Versions.props b/eng/Versions.props index 39967e22b39..8cd2dfd5606 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24324.3 - 8.0.0-preview.24518.1 - 8.0.0-preview.24518.1 + 8.0.0-preview.24519.1 + 8.0.0-preview.24519.1 9.0.0-preview.24508.2 @@ -67,7 +67,7 @@ 9.0.100-rtm.24516.6 - 1.0.551801 + 1.0.551901 $(MicrosoftNETCoreApp31Version) From 344db8f058e936a896b10de76cb5fc651b29bc06 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 21 Oct 2024 00:09:23 +0000 Subject: [PATCH 467/568] Restore branch-specific files --- .../steps/get-delegation-sas.yml | 24 ++----------------- .../templates/steps/get-delegation-sas.yml | 24 ++----------------- 2 files changed, 4 insertions(+), 44 deletions(-) diff --git a/eng/common/templates-official/steps/get-delegation-sas.yml b/eng/common/templates-official/steps/get-delegation-sas.yml index d85ea3e1cad..c5a9c1f8275 100644 --- a/eng/common/templates-official/steps/get-delegation-sas.yml +++ b/eng/common/templates-official/steps/get-delegation-sas.yml @@ -3,25 +3,5 @@ steps: parameters: is1ESPipeline: true - # Temporarily work around a helix issue where SAS tokens with / in them will cause incorrect downloads - # of correlation payloads. https://github.com/dotnet/dnceng/issues/3484 - $sas = "" - do { - $sas = az storage container generate-sas --account-name ${{ parameters.storageAccount }} --name ${{ parameters.container }} --permissions ${{ parameters.permissions }} --expiry $expiry --auth-mode login --as-user -o tsv - if ($LASTEXITCODE -ne 0) { - Write-Error "Failed to generate SAS token." - exit 1 - } - } while($sas.IndexOf('/') -ne -1) - - if ($LASTEXITCODE -ne 0) { - Write-Error "Failed to generate SAS token." - exit 1 - } - - if ('${{ parameters.base64Encode }}' -eq 'true') { - $sas = [Convert]::ToBase64String([System.Text.Encoding]::UTF8.GetBytes($sas)) - } - - Write-Host "Setting '${{ parameters.outputVariableName }}' with the access token value" - Write-Host "##vso[task.setvariable variable=${{ parameters.outputVariableName }};issecret=true]$sas" + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/eng/common/templates/steps/get-delegation-sas.yml b/eng/common/templates/steps/get-delegation-sas.yml index 2e3552e2cde..83760c9798e 100644 --- a/eng/common/templates/steps/get-delegation-sas.yml +++ b/eng/common/templates/steps/get-delegation-sas.yml @@ -3,25 +3,5 @@ steps: parameters: is1ESPipeline: false - # Temporarily work around a helix issue where SAS tokens with / in them will cause incorrect downloads - # of correlation payloads. https://github.com/dotnet/dnceng/issues/3484 - $sas = "" - do { - $sas = az storage container generate-sas --account-name ${{ parameters.storageAccount }} --name ${{ parameters.container }} --permissions ${{ parameters.permissions }} --expiry $expiry --auth-mode login --as-user -o tsv - if ($LASTEXITCODE -ne 0) { - Write-Error "Failed to generate SAS token." - exit 1 - } - } while($sas.IndexOf('/') -ne -1) - - if ($LASTEXITCODE -ne 0) { - Write-Error "Failed to generate SAS token." - exit 1 - } - - if ('${{ parameters.base64Encode }}' -eq 'true') { - $sas = [Convert]::ToBase64String([System.Text.Encoding]::UTF8.GetBytes($sas)) - } - - Write-Host "Setting '${{ parameters.outputVariableName }}' with the access token value" - Write-Host "##vso[task.setvariable variable=${{ parameters.outputVariableName }};issecret=true]$sas" + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} From 95df8cede83cddb3e6787bddbd8557743190e5b5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 21 Oct 2024 13:44:27 +0000 Subject: [PATCH 468/568] Update dependencies from https://github.com/dotnet/diagnostics build 20241020.1 (#7541) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1a7a94e224f..63314eb6bf5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore 228b9ea237f21b19647f11c98e342efdb9a1f3f1 - + https://github.com/dotnet/diagnostics - 6a90923439dc43693f2a2fc8766b3cdb2c4dd366 + 335c0c013c3a761792bfa83c0dbaadd1f0545f07 - + https://github.com/dotnet/diagnostics - 6a90923439dc43693f2a2fc8766b3cdb2c4dd366 + 335c0c013c3a761792bfa83c0dbaadd1f0545f07 https://github.com/dotnet/command-line-api @@ -42,9 +42,9 @@ https://github.com/dotnet/arcade 3c393bbd85ae16ddddba20d0b75035b0c6f1a52d - + https://github.com/dotnet/diagnostics - 6a90923439dc43693f2a2fc8766b3cdb2c4dd366 + 335c0c013c3a761792bfa83c0dbaadd1f0545f07 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 8cd2dfd5606..d4a02ef48d4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24324.3 - 8.0.0-preview.24519.1 - 8.0.0-preview.24519.1 + 8.0.0-preview.24520.1 + 8.0.0-preview.24520.1 9.0.0-preview.24508.2 @@ -67,7 +67,7 @@ 9.0.100-rtm.24516.6 - 1.0.551901 + 1.0.552001 $(MicrosoftNETCoreApp31Version) From 4da8f0141ad6280680d36f74be0302da76faa718 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 21 Oct 2024 09:38:24 -0700 Subject: [PATCH 469/568] [feature/9.x] Bump Swashbuckle.AspNetCore in /eng/dependabot/independent (#7531) Bumps [Swashbuckle.AspNetCore](https://github.com/domaindrivendev/Swashbuckle.AspNetCore) from 6.8.1 to 6.9.0. - [Release notes](https://github.com/domaindrivendev/Swashbuckle.AspNetCore/releases) - [Commits](https://github.com/domaindrivendev/Swashbuckle.AspNetCore/compare/v6.8.1...v6.9.0) --- updated-dependencies: - dependency-name: Swashbuckle.AspNetCore dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- eng/dependabot/independent/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/dependabot/independent/Versions.props b/eng/dependabot/independent/Versions.props index 09070bd620f..5fc1b3062a1 100644 --- a/eng/dependabot/independent/Versions.props +++ b/eng/dependabot/independent/Versions.props @@ -14,7 +14,7 @@ 13.0.3 11.0.0 - 6.8.1 + 6.9.0 3.7.305.7 3.7.300.33 From 5a934cd3e2dfe6fd803adb1fe99835781740d039 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 22 Oct 2024 13:25:07 +0000 Subject: [PATCH 470/568] Update dependencies from https://github.com/dotnet/diagnostics build 20241021.1 (#7543) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 63314eb6bf5..d40ab855b05 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore 228b9ea237f21b19647f11c98e342efdb9a1f3f1 - + https://github.com/dotnet/diagnostics - 335c0c013c3a761792bfa83c0dbaadd1f0545f07 + 35fab2731b24c6159e3c6d352f5345371dd640ef - + https://github.com/dotnet/diagnostics - 335c0c013c3a761792bfa83c0dbaadd1f0545f07 + 35fab2731b24c6159e3c6d352f5345371dd640ef https://github.com/dotnet/command-line-api @@ -42,9 +42,9 @@ https://github.com/dotnet/arcade 3c393bbd85ae16ddddba20d0b75035b0c6f1a52d - + https://github.com/dotnet/diagnostics - 335c0c013c3a761792bfa83c0dbaadd1f0545f07 + 35fab2731b24c6159e3c6d352f5345371dd640ef https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index d4a02ef48d4..350373d7fe7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24324.3 - 8.0.0-preview.24520.1 - 8.0.0-preview.24520.1 + 8.0.0-preview.24521.1 + 8.0.0-preview.24521.1 9.0.0-preview.24508.2 @@ -67,7 +67,7 @@ 9.0.100-rtm.24516.6 - 1.0.552001 + 1.0.552101 $(MicrosoftNETCoreApp31Version) From e147f5fb7cb68354f84bc3c5015ae0c1e3a5e723 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 23 Oct 2024 13:45:06 +0000 Subject: [PATCH 471/568] Update dependencies from https://github.com/dotnet/diagnostics build 20241022.1 (#7547) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d40ab855b05..62e3c7fa808 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore 228b9ea237f21b19647f11c98e342efdb9a1f3f1 - + https://github.com/dotnet/diagnostics - 35fab2731b24c6159e3c6d352f5345371dd640ef + c409ecc21c3ff38a8d53b740debec222a82469a8 - + https://github.com/dotnet/diagnostics - 35fab2731b24c6159e3c6d352f5345371dd640ef + c409ecc21c3ff38a8d53b740debec222a82469a8 https://github.com/dotnet/command-line-api @@ -42,9 +42,9 @@ https://github.com/dotnet/arcade 3c393bbd85ae16ddddba20d0b75035b0c6f1a52d - + https://github.com/dotnet/diagnostics - 35fab2731b24c6159e3c6d352f5345371dd640ef + c409ecc21c3ff38a8d53b740debec222a82469a8 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 350373d7fe7..6aec229a6e7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24324.3 - 8.0.0-preview.24521.1 - 8.0.0-preview.24521.1 + 8.0.0-preview.24522.1 + 8.0.0-preview.24522.1 9.0.0-preview.24508.2 @@ -67,7 +67,7 @@ 9.0.100-rtm.24516.6 - 1.0.552101 + 1.0.552201 $(MicrosoftNETCoreApp31Version) From 33836b9b1018249e9725097e1db563512539b3af Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 23 Oct 2024 13:45:50 +0000 Subject: [PATCH 472/568] Update dependencies from https://github.com/dotnet/command-line-api build 20241017.1 (#7548) [feature/9.x] Update dependencies from dotnet/command-line-api --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 62e3c7fa808..5dc7938c355 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -12,9 +12,9 @@ https://github.com/dotnet/diagnostics c409ecc21c3ff38a8d53b740debec222a82469a8 - + https://github.com/dotnet/command-line-api - 803d8598f98fb4efd94604b32627ee9407f246db + 31ab5077b28e4ebe8229e7d2ba8ae1307b1ce360 diff --git a/eng/Versions.props b/eng/Versions.props index 6aec229a6e7..727bfcd6b8a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,7 +55,7 @@ 9.0.0-rtm.24514.7 9.0.0-rtm.24514.7 - 2.0.0-beta4.24324.3 + 2.0.0-beta4.24517.1 8.0.0-preview.24522.1 8.0.0-preview.24522.1 From fa6abcf15e57c4765c5e08c82db667cc56657838 Mon Sep 17 00:00:00 2001 From: Joe Schmitt <1146681+schmittjoseph@users.noreply.github.com> Date: Wed, 23 Oct 2024 13:40:11 -0700 Subject: [PATCH 473/568] [feature/9.x] Use official diagnostic releases(#7550) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 727bfcd6b8a..fa0729ae389 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,7 +17,7 @@ - false + true $(MSBuildThisFileDirectory)xunit.runner.json From 4d2e7d5b606a48b19a2b0d523bfd08357cdc8c5b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 24 Oct 2024 13:46:47 +0000 Subject: [PATCH 474/568] Update dependencies from https://github.com/dotnet/diagnostics build 20241023.1 (#7552) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5dc7938c355..83b0b32869d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore 228b9ea237f21b19647f11c98e342efdb9a1f3f1 - + https://github.com/dotnet/diagnostics - c409ecc21c3ff38a8d53b740debec222a82469a8 + 00f385165dba7e3e6146a731c4dd219fc1ab0f57 - + https://github.com/dotnet/diagnostics - c409ecc21c3ff38a8d53b740debec222a82469a8 + 00f385165dba7e3e6146a731c4dd219fc1ab0f57 https://github.com/dotnet/command-line-api @@ -42,9 +42,9 @@ https://github.com/dotnet/arcade 3c393bbd85ae16ddddba20d0b75035b0c6f1a52d - + https://github.com/dotnet/diagnostics - c409ecc21c3ff38a8d53b740debec222a82469a8 + 00f385165dba7e3e6146a731c4dd219fc1ab0f57 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index fa0729ae389..d3e858a3a29 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24517.1 - 8.0.0-preview.24522.1 - 8.0.0-preview.24522.1 + 8.0.0-preview.24523.1 + 8.0.0-preview.24523.1 9.0.0-preview.24508.2 @@ -67,7 +67,7 @@ 9.0.100-rtm.24516.6 - 1.0.552201 + 1.0.552301 $(MicrosoftNETCoreApp31Version) From 4e54bea1e8a0b2006c924d326dadc602afb63076 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 25 Oct 2024 13:45:08 +0000 Subject: [PATCH 475/568] Update dependencies from https://github.com/dotnet/diagnostics build 20241024.2 (#7554) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 83b0b32869d..ce80a34ffd5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore 228b9ea237f21b19647f11c98e342efdb9a1f3f1 - + https://github.com/dotnet/diagnostics - 00f385165dba7e3e6146a731c4dd219fc1ab0f57 + fb42efa7386526361eab1242fa112edffbdf7ebb - + https://github.com/dotnet/diagnostics - 00f385165dba7e3e6146a731c4dd219fc1ab0f57 + fb42efa7386526361eab1242fa112edffbdf7ebb https://github.com/dotnet/command-line-api @@ -42,9 +42,9 @@ https://github.com/dotnet/arcade 3c393bbd85ae16ddddba20d0b75035b0c6f1a52d - + https://github.com/dotnet/diagnostics - 00f385165dba7e3e6146a731c4dd219fc1ab0f57 + fb42efa7386526361eab1242fa112edffbdf7ebb https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index d3e858a3a29..290da57b026 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24517.1 - 8.0.0-preview.24523.1 - 8.0.0-preview.24523.1 + 8.0.0-preview.24524.2 + 8.0.0-preview.24524.2 9.0.0-preview.24508.2 @@ -67,7 +67,7 @@ 9.0.100-rtm.24516.6 - 1.0.552301 + 1.0.552402 $(MicrosoftNETCoreApp31Version) From 0bb819a4fa5193104e76685b0aa987d9926170bc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 25 Oct 2024 18:26:30 +0000 Subject: [PATCH 476/568] [feature/9.x] Bump Azure.Identity (#7557) Bumps the azure-sdk-dependencies group in /eng/dependabot/independent with 1 update: [Azure.Identity](https://github.com/Azure/azure-sdk-for-net). Updates `Azure.Identity` from 1.13.0 to 1.13.1 - [Release notes](https://github.com/Azure/azure-sdk-for-net/releases) - [Commits](https://github.com/Azure/azure-sdk-for-net/compare/Azure.Identity_1.13.0...Azure.Identity_1.13.1) --- updated-dependencies: - dependency-name: Azure.Identity dependency-type: direct:production update-type: version-update:semver-patch dependency-group: azure-sdk-dependencies ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- eng/dependabot/independent/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/dependabot/independent/Versions.props b/eng/dependabot/independent/Versions.props index 5fc1b3062a1..3f68b5f48b6 100644 --- a/eng/dependabot/independent/Versions.props +++ b/eng/dependabot/independent/Versions.props @@ -3,7 +3,7 @@ 1.44.1 - 1.13.0 + 1.13.1 12.22.2 12.20.1 3.2.2 From ceefe9f0406fee74b36af9f8bae4e6ad8e8cf681 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 26 Oct 2024 13:43:26 +0000 Subject: [PATCH 477/568] Update dependencies from https://github.com/dotnet/diagnostics build 20241025.1 (#7561) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ce80a34ffd5..68b8547437a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore 228b9ea237f21b19647f11c98e342efdb9a1f3f1 - + https://github.com/dotnet/diagnostics - fb42efa7386526361eab1242fa112edffbdf7ebb + eb01be7a1ca6dac20d5afae1f818ad8ffbfd1f92 - + https://github.com/dotnet/diagnostics - fb42efa7386526361eab1242fa112edffbdf7ebb + eb01be7a1ca6dac20d5afae1f818ad8ffbfd1f92 https://github.com/dotnet/command-line-api @@ -42,9 +42,9 @@ https://github.com/dotnet/arcade 3c393bbd85ae16ddddba20d0b75035b0c6f1a52d - + https://github.com/dotnet/diagnostics - fb42efa7386526361eab1242fa112edffbdf7ebb + eb01be7a1ca6dac20d5afae1f818ad8ffbfd1f92 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 290da57b026..3f2fedca1b1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24517.1 - 8.0.0-preview.24524.2 - 8.0.0-preview.24524.2 + 8.0.0-preview.24525.1 + 8.0.0-preview.24525.1 9.0.0-preview.24508.2 @@ -67,7 +67,7 @@ 9.0.100-rtm.24516.6 - 1.0.552402 + 1.0.552501 $(MicrosoftNETCoreApp31Version) From fb2e55a5633aa47e2cf00fa9603b87b15e2160a7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 27 Oct 2024 13:22:03 +0000 Subject: [PATCH 478/568] Update dependencies from https://github.com/dotnet/diagnostics build 20241026.1 (#7564) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 68b8547437a..c0de6a2dfe9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore 228b9ea237f21b19647f11c98e342efdb9a1f3f1 - + https://github.com/dotnet/diagnostics - eb01be7a1ca6dac20d5afae1f818ad8ffbfd1f92 + 088cb850e046ad28b522cf29f7e17811486623f5 - + https://github.com/dotnet/diagnostics - eb01be7a1ca6dac20d5afae1f818ad8ffbfd1f92 + 088cb850e046ad28b522cf29f7e17811486623f5 https://github.com/dotnet/command-line-api @@ -42,9 +42,9 @@ https://github.com/dotnet/arcade 3c393bbd85ae16ddddba20d0b75035b0c6f1a52d - + https://github.com/dotnet/diagnostics - eb01be7a1ca6dac20d5afae1f818ad8ffbfd1f92 + 088cb850e046ad28b522cf29f7e17811486623f5 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 3f2fedca1b1..cc922f7815c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24517.1 - 8.0.0-preview.24525.1 - 8.0.0-preview.24525.1 + 8.0.0-preview.24526.1 + 8.0.0-preview.24526.1 9.0.0-preview.24508.2 @@ -67,7 +67,7 @@ 9.0.100-rtm.24516.6 - 1.0.552501 + 1.0.552601 $(MicrosoftNETCoreApp31Version) From c1718935db70963868a63fd2954e7b1f72ff26a4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 28 Oct 2024 13:54:21 +0000 Subject: [PATCH 479/568] Update dependencies from https://github.com/dotnet/diagnostics build 20241027.1 (#7569) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 6 +++--- eng/Versions.props | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c0de6a2dfe9..c5609463170 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,11 +4,11 @@ https://github.com/dotnet/aspnetcore 228b9ea237f21b19647f11c98e342efdb9a1f3f1 - + https://github.com/dotnet/diagnostics 088cb850e046ad28b522cf29f7e17811486623f5 - + https://github.com/dotnet/diagnostics 088cb850e046ad28b522cf29f7e17811486623f5 @@ -42,7 +42,7 @@ https://github.com/dotnet/arcade 3c393bbd85ae16ddddba20d0b75035b0c6f1a52d - + https://github.com/dotnet/diagnostics 088cb850e046ad28b522cf29f7e17811486623f5 diff --git a/eng/Versions.props b/eng/Versions.props index cc922f7815c..178fd300fa7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24517.1 - 8.0.0-preview.24526.1 - 8.0.0-preview.24526.1 + 8.0.0-preview.24527.1 + 8.0.0-preview.24527.1 9.0.0-preview.24508.2 @@ -67,7 +67,7 @@ 9.0.100-rtm.24516.6 - 1.0.552601 + 1.0.552701 $(MicrosoftNETCoreApp31Version) From 2c9a697fc4a59ca76fc0b6e1259078b53c1022e8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 29 Oct 2024 13:59:51 +0000 Subject: [PATCH 480/568] Update dependencies from https://github.com/dotnet/command-line-api build 20241028.1 (#7576) [feature/9.x] Update dependencies from dotnet/command-line-api --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c5609463170..d0d172caa64 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -12,9 +12,9 @@ https://github.com/dotnet/diagnostics 088cb850e046ad28b522cf29f7e17811486623f5 - + https://github.com/dotnet/command-line-api - 31ab5077b28e4ebe8229e7d2ba8ae1307b1ce360 + feb61c7f328a2401d74f4317b39d02126cfdfe24 diff --git a/eng/Versions.props b/eng/Versions.props index 178fd300fa7..ac4c88a098a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,7 +55,7 @@ 9.0.0-rtm.24514.7 9.0.0-rtm.24514.7 - 2.0.0-beta4.24517.1 + 2.0.0-beta4.24528.1 8.0.0-preview.24527.1 8.0.0-preview.24527.1 From 7db72e5c40e529d17dd5b0c298ec3e5c6027d716 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 29 Oct 2024 17:17:20 +0000 Subject: [PATCH 481/568] Update dependencies from https://github.com/dotnet/diagnostics build 20241028.1 (#7575) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d0d172caa64..c9d5d3898a6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore 228b9ea237f21b19647f11c98e342efdb9a1f3f1 - + https://github.com/dotnet/diagnostics - 088cb850e046ad28b522cf29f7e17811486623f5 + ca2a2acfd3516444ce7b7c2ad5be0074138f4e6c - + https://github.com/dotnet/diagnostics - 088cb850e046ad28b522cf29f7e17811486623f5 + ca2a2acfd3516444ce7b7c2ad5be0074138f4e6c https://github.com/dotnet/command-line-api @@ -42,9 +42,9 @@ https://github.com/dotnet/arcade 3c393bbd85ae16ddddba20d0b75035b0c6f1a52d - + https://github.com/dotnet/diagnostics - 088cb850e046ad28b522cf29f7e17811486623f5 + ca2a2acfd3516444ce7b7c2ad5be0074138f4e6c https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index ac4c88a098a..68984415f3b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24528.1 - 8.0.0-preview.24527.1 - 8.0.0-preview.24527.1 + 8.0.0-preview.24528.1 + 8.0.0-preview.24528.1 9.0.0-preview.24508.2 @@ -67,7 +67,7 @@ 9.0.100-rtm.24516.6 - 1.0.552701 + 1.0.552801 $(MicrosoftNETCoreApp31Version) From 5116d05e886d2659ddfef032ec4d6124a6ba7d51 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 29 Oct 2024 10:48:56 -0700 Subject: [PATCH 482/568] Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20241027.2 (#7565) Microsoft.CodeAnalysis.NetAnalyzers From Version 9.0.0-preview.24508.2 -> To Version 9.0.0-preview.24527.2 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 2 +- eng/Versions.props | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c9d5d3898a6..ff69d952b89 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -18,7 +18,7 @@ - + https://github.com/dotnet/roslyn-analyzers 3d61c57c73c3dd5f1f407ef9cd3414d94bf0eaf2 diff --git a/eng/Versions.props b/eng/Versions.props index 68984415f3b..6f84b8c2687 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -60,7 +60,7 @@ 8.0.0-preview.24528.1 8.0.0-preview.24528.1 - 9.0.0-preview.24508.2 + 9.0.0-preview.24527.2 9.0.0-rtm.24515.9 9.0.0-rtm.24515.9 From 6c6ad6e83e96dc660ad4efbb9a19ed2a3fd8307d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 29 Oct 2024 18:12:00 +0000 Subject: [PATCH 483/568] [feature/9.x] Update dependencies from dotnet/sdk (#7523) * Update dependencies from https://github.com/dotnet/sdk build 20241017.5 VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0 From Version 9.0.100-rtm.24516.6 -> To Version 9.0.100-rtm.24517.5 Dependency coherency updates Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0 From Version 9.0.0-rtm.24514.7 -> To Version 9.0.0 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0 * Update dependencies from https://github.com/dotnet/sdk build 20241018.7 VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0 From Version 9.0.100-rtm.24517.5 -> To Version 9.0.100-rtm.24518.7 * Update dependencies from https://github.com/dotnet/sdk build 20241018.42 VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0 From Version 9.0.100-rtm.24518.7 -> To Version 9.0.100-rtm.24518.42 * Update dependencies from https://github.com/dotnet/sdk build 20241020.4 VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0 From Version 9.0.100-rtm.24518.42 -> To Version 9.0.100-rtm.24520.4 * Update dependencies from https://github.com/dotnet/sdk build 20241021.19 VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0 From Version 9.0.100-rtm.24520.4 -> To Version 9.0.100-rtm.24521.19 * Update dependencies from https://github.com/dotnet/sdk build 20241023.3 VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0 From Version 9.0.100-rtm.24521.19 -> To Version 9.0.100-rtm.24523.3 * Update dependencies from https://github.com/dotnet/sdk build 20241023.41 VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0 From Version 9.0.100-rtm.24523.3 -> To Version 9.0.100-rtm.24523.41 * Update dependencies from https://github.com/dotnet/sdk build 20241024.13 VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0 From Version 9.0.100-rtm.24516.6 -> To Version 9.0.100-rtm.24524.13 * Update dependencies from https://github.com/dotnet/sdk build 20241027.3 VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0 From Version 9.0.100-rtm.24516.6 -> To Version 9.0.100-rtm.24527.3 * Update target sdk --------- Co-authored-by: dotnet-maestro[bot] Co-authored-by: Joe Schmitt <1146681+schmittjoseph@users.noreply.github.com> Co-authored-by: Joe Schmitt --- NuGet.config | 2 ++ eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- eng/helix/Helix.proj | 4 ++-- global.json | 8 ++++---- 5 files changed, 23 insertions(+), 21 deletions(-) diff --git a/NuGet.config b/NuGet.config index c59695f632b..f5a34821b11 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,8 +10,10 @@ + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ff69d952b89..cbb19330f98 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/aspnetcore - 228b9ea237f21b19647f11c98e342efdb9a1f3f1 + 1e7a7af6d2417242b244d2a0f4f23fcce8e88d2f https://github.com/dotnet/diagnostics @@ -46,21 +46,21 @@ https://github.com/dotnet/diagnostics ca2a2acfd3516444ce7b7c2ad5be0074138f4e6c - + https://github.com/dotnet/runtime - cf1c582931dc647b8e6ca58c34fcfb20d5d07a42 + d3981726bc8b0e179db50301daf9f22d42393096 - + https://github.com/dotnet/aspnetcore - 228b9ea237f21b19647f11c98e342efdb9a1f3f1 + 1e7a7af6d2417242b244d2a0f4f23fcce8e88d2f - + https://github.com/dotnet/sdk - 3aa4e4a78d5256d91514bef17eb5ebe3dce6743a + 50e04b8d1d8ff413de90383aa799e4189612f685 - + https://github.com/dotnet/runtime - cf1c582931dc647b8e6ca58c34fcfb20d5d07a42 + d3981726bc8b0e179db50301daf9f22d42393096 diff --git a/eng/Versions.props b/eng/Versions.props index 6f84b8c2687..7832737e27b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,8 +52,8 @@ 9.0.0-beta.24516.2 9.0.0-beta.24516.2 - 9.0.0-rtm.24514.7 - 9.0.0-rtm.24514.7 + 9.0.0 + 9.0.0-rtm.24516.19 2.0.0-beta4.24528.1 @@ -62,10 +62,10 @@ 9.0.0-preview.24527.2 - 9.0.0-rtm.24515.9 - 9.0.0-rtm.24515.9 + 9.0.0 + 9.0.0-rtm.24516.10 - 9.0.100-rtm.24516.6 + 9.0.100-rtm.24527.3 1.0.552801 diff --git a/eng/helix/Helix.proj b/eng/helix/Helix.proj index 63c33fcb30d..18465495f75 100644 --- a/eng/helix/Helix.proj +++ b/eng/helix/Helix.proj @@ -136,10 +136,10 @@ aspnetcore-runtime - + aspnetcore-runtime - + diff --git a/global.json b/global.json index 2c0f1518455..13ae5e67e6b 100644 --- a/global.json +++ b/global.json @@ -6,25 +6,25 @@ "$(MicrosoftAspNetCoreApp60Version)", "$(MicrosoftAspNetCoreApp70Version)", "$(MicrosoftAspNetCoreApp80Version)", - "$(MicrosoftAspNetCoreApp90Version)" + "$(VSRedistCommonAspNetCoreSharedFrameworkx6490Version)" ], "aspnetcore/x86": [ "$(MicrosoftAspNetCoreApp60Version)", "$(MicrosoftAspNetCoreApp70Version)", "$(MicrosoftAspNetCoreApp80Version)", - "$(MicrosoftAspNetCoreApp90Version)" + "$(VSRedistCommonAspNetCoreSharedFrameworkx6490Version)" ], "dotnet": [ "$(MicrosoftNETCoreApp60Version)", "$(MicrosoftNETCoreApp70Version)", "$(MicrosoftNETCoreApp80Version)", - "$(MicrosoftNETCoreApp90Version)" + "$(VSRedistCommonNetCoreSharedFrameworkx6490Version)" ], "dotnet/x86": [ "$(MicrosoftNETCoreApp60Version)", "$(MicrosoftNETCoreApp70Version)", "$(MicrosoftNETCoreApp80Version)", - "$(MicrosoftNETCoreApp90Version)" + "$(VSRedistCommonNetCoreSharedFrameworkx6490Version)" ] }, "xcopy-msbuild": "17.8.5" From 872cc37f59659c8c28fd90d1695ce9f61db1d7ac Mon Sep 17 00:00:00 2001 From: Joe Schmitt <1146681+schmittjoseph@users.noreply.github.com> Date: Tue, 29 Oct 2024 14:30:23 -0700 Subject: [PATCH 484/568] [feature/9.x] Force STJ Update (#7583) --- eng/dependabot/net9.0/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/dependabot/net9.0/Versions.props b/eng/dependabot/net9.0/Versions.props index b2e79649173..3f694372110 100644 --- a/eng/dependabot/net9.0/Versions.props +++ b/eng/dependabot/net9.0/Versions.props @@ -1,6 +1,6 @@ - 9.0.0-rc.1.24431.7 + 9.0.0-rc.2.24473.5 From 1c7c278d9f158e9446470bdc11226d0d68e278d1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 29 Oct 2024 22:57:33 +0000 Subject: [PATCH 485/568] [feature/9.x] Bump Microsoft.Identity.Web (#7579) Bumps the identity-dependencies group in /eng/dependabot/independent with 1 update: [Microsoft.Identity.Web](https://github.com/AzureAD/microsoft-identity-web). Updates `Microsoft.Identity.Web` from 3.2.2 to 3.3.0 - [Release notes](https://github.com/AzureAD/microsoft-identity-web/releases) - [Changelog](https://github.com/AzureAD/microsoft-identity-web/blob/master/changelog.md) - [Commits](https://github.com/AzureAD/microsoft-identity-web/compare/3.2.2...3.3.0) --- updated-dependencies: - dependency-name: Microsoft.Identity.Web dependency-type: direct:production update-type: version-update:semver-minor dependency-group: identity-dependencies ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- eng/dependabot/independent/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/dependabot/independent/Versions.props b/eng/dependabot/independent/Versions.props index 3f68b5f48b6..becf4905037 100644 --- a/eng/dependabot/independent/Versions.props +++ b/eng/dependabot/independent/Versions.props @@ -6,7 +6,7 @@ 1.13.1 12.22.2 12.20.1 - 3.2.2 + 3.3.0 1.6.22 4.3.2 5.0.0 From ba73a7df442259bf215ba11f760d662838aef9ac Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 31 Oct 2024 13:47:58 +0000 Subject: [PATCH 486/568] Update dependencies from https://github.com/dotnet/diagnostics build 20241030.1 (#7587) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cbb19330f98..55ab18622be 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore 1e7a7af6d2417242b244d2a0f4f23fcce8e88d2f - + https://github.com/dotnet/diagnostics - ca2a2acfd3516444ce7b7c2ad5be0074138f4e6c + 63678d430408da77a93ac59015ce958943c16b68 - + https://github.com/dotnet/diagnostics - ca2a2acfd3516444ce7b7c2ad5be0074138f4e6c + 63678d430408da77a93ac59015ce958943c16b68 https://github.com/dotnet/command-line-api @@ -42,9 +42,9 @@ https://github.com/dotnet/arcade 3c393bbd85ae16ddddba20d0b75035b0c6f1a52d - + https://github.com/dotnet/diagnostics - ca2a2acfd3516444ce7b7c2ad5be0074138f4e6c + 63678d430408da77a93ac59015ce958943c16b68 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 7832737e27b..adf6e19a720 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24528.1 - 8.0.0-preview.24528.1 - 8.0.0-preview.24528.1 + 9.0.0-preview.24530.1 + 9.0.0-preview.24530.1 9.0.0-preview.24527.2 @@ -67,7 +67,7 @@ 9.0.100-rtm.24527.3 - 1.0.552801 + 1.0.553001 $(MicrosoftNETCoreApp31Version) From d90549858d73e60e52a7195506b8161c81ef0b7f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 1 Nov 2024 13:51:50 +0000 Subject: [PATCH 487/568] Update dependencies from https://github.com/dotnet/diagnostics build 20241031.2 (#7590) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 55ab18622be..cb273c90432 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore 1e7a7af6d2417242b244d2a0f4f23fcce8e88d2f - + https://github.com/dotnet/diagnostics - 63678d430408da77a93ac59015ce958943c16b68 + d8852585edaac53044b5a001ef9fda77625f5c36 - + https://github.com/dotnet/diagnostics - 63678d430408da77a93ac59015ce958943c16b68 + d8852585edaac53044b5a001ef9fda77625f5c36 https://github.com/dotnet/command-line-api @@ -42,9 +42,9 @@ https://github.com/dotnet/arcade 3c393bbd85ae16ddddba20d0b75035b0c6f1a52d - + https://github.com/dotnet/diagnostics - 63678d430408da77a93ac59015ce958943c16b68 + d8852585edaac53044b5a001ef9fda77625f5c36 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index adf6e19a720..c349954a11e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24528.1 - 9.0.0-preview.24530.1 - 9.0.0-preview.24530.1 + 9.0.0-preview.24531.2 + 9.0.0-preview.24531.2 9.0.0-preview.24527.2 @@ -67,7 +67,7 @@ 9.0.100-rtm.24527.3 - 1.0.553001 + 1.0.553102 $(MicrosoftNETCoreApp31Version) From 835c1dc446815692d5c8ce3c53fe823ed2b1a028 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 2 Nov 2024 14:03:50 +0000 Subject: [PATCH 488/568] Update dependencies from https://github.com/dotnet/diagnostics build 20241101.1 (#7593) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 6 +++--- eng/Versions.props | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cb273c90432..8ee70d822b2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,11 +4,11 @@ https://github.com/dotnet/aspnetcore 1e7a7af6d2417242b244d2a0f4f23fcce8e88d2f - + https://github.com/dotnet/diagnostics d8852585edaac53044b5a001ef9fda77625f5c36 - + https://github.com/dotnet/diagnostics d8852585edaac53044b5a001ef9fda77625f5c36 @@ -42,7 +42,7 @@ https://github.com/dotnet/arcade 3c393bbd85ae16ddddba20d0b75035b0c6f1a52d - + https://github.com/dotnet/diagnostics d8852585edaac53044b5a001ef9fda77625f5c36 diff --git a/eng/Versions.props b/eng/Versions.props index c349954a11e..e4fb39c1907 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24528.1 - 9.0.0-preview.24531.2 - 9.0.0-preview.24531.2 + 9.0.0-preview.24551.1 + 9.0.0-preview.24551.1 9.0.0-preview.24527.2 @@ -67,7 +67,7 @@ 9.0.100-rtm.24527.3 - 1.0.553102 + 1.0.555101 $(MicrosoftNETCoreApp31Version) From 5dff89bd74caddb90f6b3bc3ce7d117e3819a7ad Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Nov 2024 16:38:14 -0800 Subject: [PATCH 489/568] [feature/9.x] Bump the identity-dependencies group (#7600) Bumps the identity-dependencies group in /eng/dependabot/independent with 3 updates: [Azure.Core](https://github.com/Azure/azure-sdk-for-net), [Azure.Identity](https://github.com/Azure/azure-sdk-for-net) and [Microsoft.Identity.Web](https://github.com/AzureAD/microsoft-identity-web). Updates `Azure.Core` from 1.44.1 to 1.38.0 - [Release notes](https://github.com/Azure/azure-sdk-for-net/releases) - [Commits](https://github.com/Azure/azure-sdk-for-net/compare/Azure.Core_1.44.1...Azure.Core_1.38.0) Updates `Azure.Identity` from 1.13.1 to 1.11.4 - [Release notes](https://github.com/Azure/azure-sdk-for-net/releases) - [Commits](https://github.com/Azure/azure-sdk-for-net/compare/Azure.Identity_1.13.1...Azure.Identity_1.11.4) Updates `Microsoft.Identity.Web` from 3.3.0 to 3.3.1 - [Release notes](https://github.com/AzureAD/microsoft-identity-web/releases) - [Changelog](https://github.com/AzureAD/microsoft-identity-web/blob/master/changelog.md) - [Commits](https://github.com/AzureAD/microsoft-identity-web/compare/3.3.0...3.3.1) --- updated-dependencies: - dependency-name: Azure.Core dependency-type: direct:production update-type: version-update:semver-minor dependency-group: identity-dependencies - dependency-name: Azure.Identity dependency-type: direct:production update-type: version-update:semver-minor dependency-group: identity-dependencies - dependency-name: Microsoft.Identity.Web dependency-type: direct:production update-type: version-update:semver-patch dependency-group: identity-dependencies ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- eng/dependabot/independent/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/dependabot/independent/Versions.props b/eng/dependabot/independent/Versions.props index becf4905037..c1031b3033a 100644 --- a/eng/dependabot/independent/Versions.props +++ b/eng/dependabot/independent/Versions.props @@ -6,7 +6,7 @@ 1.13.1 12.22.2 12.20.1 - 3.3.0 + 3.3.1 1.6.22 4.3.2 5.0.0 From 894b61d2749b5aa10e789a1a7dc666c8280af970 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 5 Nov 2024 11:11:24 -0800 Subject: [PATCH 490/568] [feature/9.x] Update dependencies from dotnet/diagnostics (#7595) * Update dependencies from https://github.com/dotnet/diagnostics build 20241102.1 Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe , Microsoft.FileFormats From Version 9.0.0-preview.24551.1 -> To Version 9.0.0-preview.24552.1 * Update dependencies from https://github.com/dotnet/diagnostics build 20241103.1 Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe , Microsoft.FileFormats From Version 9.0.0-preview.24551.1 -> To Version 9.0.0-preview.24553.1 * Update dependencies from https://github.com/dotnet/diagnostics build 20241104.2 Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe , Microsoft.FileFormats From Version 9.0.0-preview.24551.1 -> To Version 9.0.0-preview.24554.2 --------- Co-authored-by: dotnet-maestro[bot] Co-authored-by: Joe Schmitt <1146681+schmittjoseph@users.noreply.github.com> --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8ee70d822b2..c09caa4d5ad 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore 1e7a7af6d2417242b244d2a0f4f23fcce8e88d2f - + https://github.com/dotnet/diagnostics - d8852585edaac53044b5a001ef9fda77625f5c36 + da9510470934a71eaa1165e3276a57e08148e061 - + https://github.com/dotnet/diagnostics - d8852585edaac53044b5a001ef9fda77625f5c36 + da9510470934a71eaa1165e3276a57e08148e061 https://github.com/dotnet/command-line-api @@ -42,9 +42,9 @@ https://github.com/dotnet/arcade 3c393bbd85ae16ddddba20d0b75035b0c6f1a52d - + https://github.com/dotnet/diagnostics - d8852585edaac53044b5a001ef9fda77625f5c36 + da9510470934a71eaa1165e3276a57e08148e061 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index e4fb39c1907..39cc032807f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24528.1 - 9.0.0-preview.24551.1 - 9.0.0-preview.24551.1 + 9.0.0-preview.24554.2 + 9.0.0-preview.24554.2 9.0.0-preview.24527.2 @@ -67,7 +67,7 @@ 9.0.100-rtm.24527.3 - 1.0.555101 + 1.0.555402 $(MicrosoftNETCoreApp31Version) From 15146ee3c77577bc1ac3469d731a005d11b2df57 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 6 Nov 2024 10:49:57 -0800 Subject: [PATCH 491/568] [feature/9.x] Bump Microsoft.Diagnostics.DbgShim (#7611) Bumps [Microsoft.Diagnostics.DbgShim](https://github.com/dotnet/diagnostics) from 8.0.547301 to 9.0.553101. - [Release notes](https://github.com/dotnet/diagnostics/releases) - [Commits](https://github.com/dotnet/diagnostics/compare/v8.0.547301...v9.0.553101) --- updated-dependencies: - dependency-name: Microsoft.Diagnostics.DbgShim dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- eng/dependabot/nuget.org/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/dependabot/nuget.org/Versions.props b/eng/dependabot/nuget.org/Versions.props index 163a8646de6..8c5699e4f4f 100644 --- a/eng/dependabot/nuget.org/Versions.props +++ b/eng/dependabot/nuget.org/Versions.props @@ -2,6 +2,6 @@ - 8.0.547301 + 9.0.553101 From 8430e9689df3c2a9f51c58c4b620ef27456abe39 Mon Sep 17 00:00:00 2001 From: Justin Anderson Date: Wed, 6 Nov 2024 14:17:15 -0800 Subject: [PATCH 492/568] Update .NET 9 System.Text.Json to 9.0.0 (#7619) --- eng/dependabot/net9.0/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/dependabot/net9.0/Versions.props b/eng/dependabot/net9.0/Versions.props index 3f694372110..4e54abecb78 100644 --- a/eng/dependabot/net9.0/Versions.props +++ b/eng/dependabot/net9.0/Versions.props @@ -1,6 +1,6 @@ - 9.0.0-rc.2.24473.5 + 9.0.0 From acde1c900ee688874fb2abba5609049f73d9099a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 7 Nov 2024 15:26:19 -0800 Subject: [PATCH 493/568] update release information (#7638) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- eng/Versions.props | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 39cc032807f..8fbe4e1330b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -3,9 +3,9 @@ https://github.com/dotnet/dotnet-monitor - 9.0.0 - rtm - release + 9.1.0 + alpha + 1 true - 9.0.100-rtm.24527.3 + 9.0.101-servicing.24561.8 1.0.555402 From 51c80eb214a93ebe12f5926df9141686c0229a91 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 12 Nov 2024 11:44:12 -0800 Subject: [PATCH 495/568] [feature/9.x] Update dependencies from dotnet/diagnostics (#7626) * Update dependencies from https://github.com/dotnet/diagnostics build 20241106.1 Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe , Microsoft.FileFormats From Version 9.0.0-preview.24554.2 -> To Version 9.0.0-preview.24556.1 * Update dependencies from https://github.com/dotnet/diagnostics build 20241107.2 Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe , Microsoft.FileFormats From Version 9.0.0-preview.24554.2 -> To Version 9.0.0-preview.24557.2 * Update dependencies from https://github.com/dotnet/diagnostics build 20241108.1 Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe , Microsoft.FileFormats From Version 9.0.0-preview.24554.2 -> To Version 9.0.0-preview.24558.1 * Update dependencies from https://github.com/dotnet/diagnostics build 20241110.1 Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe , Microsoft.FileFormats From Version 9.0.0-preview.24554.2 -> To Version 9.0.0-preview.24560.1 * Update dependencies from https://github.com/dotnet/diagnostics build 20241111.1 Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe , Microsoft.FileFormats From Version 9.0.0-preview.24554.2 -> To Version 9.0.0-preview.24561.1 --------- Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 24bca396466..ffa4ed4bee6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore 1e7a7af6d2417242b244d2a0f4f23fcce8e88d2f - + https://github.com/dotnet/diagnostics - da9510470934a71eaa1165e3276a57e08148e061 + 58a61d4e25a763c0f1f169cb090f4bd2d03c2c7c - + https://github.com/dotnet/diagnostics - da9510470934a71eaa1165e3276a57e08148e061 + 58a61d4e25a763c0f1f169cb090f4bd2d03c2c7c https://github.com/dotnet/command-line-api @@ -42,9 +42,9 @@ https://github.com/dotnet/arcade 3c393bbd85ae16ddddba20d0b75035b0c6f1a52d - + https://github.com/dotnet/diagnostics - da9510470934a71eaa1165e3276a57e08148e061 + 58a61d4e25a763c0f1f169cb090f4bd2d03c2c7c https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 0f98e623d5c..f0342ff2710 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24528.1 - 9.0.0-preview.24554.2 - 9.0.0-preview.24554.2 + 9.0.0-preview.24561.1 + 9.0.0-preview.24561.1 9.0.0-preview.24527.2 @@ -67,7 +67,7 @@ 9.0.101-servicing.24561.8 - 1.0.555402 + 1.0.556101 $(MicrosoftNETCoreApp31Version) From 7339fc6fb2828351848c169389dc49e36ddd4040 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 13 Nov 2024 15:05:47 +0000 Subject: [PATCH 496/568] Update dependencies from https://github.com/dotnet/diagnostics build 20241112.1 (#7670) [feature/9.x] Update dependencies from dotnet/diagnostics --- NuGet.config | 2 -- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index f5a34821b11..c59695f632b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,10 +10,8 @@ - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ffa4ed4bee6..addfe9f0672 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore 1e7a7af6d2417242b244d2a0f4f23fcce8e88d2f - + https://github.com/dotnet/diagnostics - 58a61d4e25a763c0f1f169cb090f4bd2d03c2c7c + d1d00bba1865fac0b1717c2a983aeb945274c1dc - + https://github.com/dotnet/diagnostics - 58a61d4e25a763c0f1f169cb090f4bd2d03c2c7c + d1d00bba1865fac0b1717c2a983aeb945274c1dc https://github.com/dotnet/command-line-api @@ -42,9 +42,9 @@ https://github.com/dotnet/arcade 3c393bbd85ae16ddddba20d0b75035b0c6f1a52d - + https://github.com/dotnet/diagnostics - 58a61d4e25a763c0f1f169cb090f4bd2d03c2c7c + d1d00bba1865fac0b1717c2a983aeb945274c1dc https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index f0342ff2710..752540b5ea0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24528.1 - 9.0.0-preview.24561.1 - 9.0.0-preview.24561.1 + 9.0.0-preview.24562.1 + 9.0.0-preview.24562.1 9.0.0-preview.24527.2 @@ -67,7 +67,7 @@ 9.0.101-servicing.24561.8 - 1.0.556101 + 1.0.556201 $(MicrosoftNETCoreApp31Version) From 899c1b712763288a99ca44d828e05f7373363848 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 14 Nov 2024 15:16:33 +0000 Subject: [PATCH 497/568] Update dependencies from https://github.com/dotnet/diagnostics build 20241113.1 (#7679) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 6 +++--- eng/Versions.props | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index addfe9f0672..3ff31de97c0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,11 +4,11 @@ https://github.com/dotnet/aspnetcore 1e7a7af6d2417242b244d2a0f4f23fcce8e88d2f - + https://github.com/dotnet/diagnostics d1d00bba1865fac0b1717c2a983aeb945274c1dc - + https://github.com/dotnet/diagnostics d1d00bba1865fac0b1717c2a983aeb945274c1dc @@ -42,7 +42,7 @@ https://github.com/dotnet/arcade 3c393bbd85ae16ddddba20d0b75035b0c6f1a52d - + https://github.com/dotnet/diagnostics d1d00bba1865fac0b1717c2a983aeb945274c1dc diff --git a/eng/Versions.props b/eng/Versions.props index 752540b5ea0..1c918a03bda 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24528.1 - 9.0.0-preview.24562.1 - 9.0.0-preview.24562.1 + 9.0.0-preview.24563.1 + 9.0.0-preview.24563.1 9.0.0-preview.24527.2 @@ -67,7 +67,7 @@ 9.0.101-servicing.24561.8 - 1.0.556201 + 1.0.556301 $(MicrosoftNETCoreApp31Version) From 4842462f69f158a8010dd58482b810c4ce1db357 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 14 Nov 2024 11:35:45 -0800 Subject: [PATCH 498/568] [feature/9.x] Bump the runtime-dependencies group (#7667) Bumps the runtime-dependencies group in /eng/dependabot/net6.0 with 5 updates: | Package | From | To | | --- | --- | --- | | [Microsoft.Extensions.Configuration.Abstractions](https://github.com/dotnet/runtime) | `6.0.0` | `6.0.1` | | [Microsoft.Extensions.Logging](https://github.com/dotnet/runtime) | `6.0.0` | `6.0.1` | | [Microsoft.Extensions.Logging.Abstractions](https://github.com/dotnet/runtime) | `6.0.4` | `6.0.4` | | [Microsoft.Extensions.Logging.Console](https://github.com/dotnet/runtime) | `6.0.0` | `6.0.1` | | [Microsoft.NETCore.DotNetHost](https://github.com/dotnet/runtime) | `6.0.35` | `6.0.36` | Updates `Microsoft.Extensions.Configuration.Abstractions` from 6.0.0 to 6.0.1 - [Release notes](https://github.com/dotnet/runtime/releases) - [Commits](https://github.com/dotnet/runtime/compare/v6.0.0...v6.0.1) Updates `Microsoft.Extensions.Logging` from 6.0.0 to 6.0.1 - [Release notes](https://github.com/dotnet/runtime/releases) - [Commits](https://github.com/dotnet/runtime/compare/v6.0.0...v6.0.1) Updates `Microsoft.Extensions.Logging.Abstractions` from 6.0.4 to 6.0.4 - [Release notes](https://github.com/dotnet/runtime/releases) - [Commits](https://github.com/dotnet/runtime/compare/v6.0.4...v6.0.4) Updates `Microsoft.Extensions.Configuration.Abstractions` from 6.0.0 to 6.0.1 - [Release notes](https://github.com/dotnet/runtime/releases) - [Commits](https://github.com/dotnet/runtime/compare/v6.0.0...v6.0.1) Updates `Microsoft.Extensions.Logging` from 6.0.0 to 6.0.1 - [Release notes](https://github.com/dotnet/runtime/releases) - [Commits](https://github.com/dotnet/runtime/compare/v6.0.0...v6.0.1) Updates `Microsoft.Extensions.Logging.Abstractions` from 6.0.4 to 6.0.4 - [Release notes](https://github.com/dotnet/runtime/releases) - [Commits](https://github.com/dotnet/runtime/compare/v6.0.4...v6.0.4) Updates `Microsoft.Extensions.Logging.Console` from 6.0.0 to 6.0.1 - [Release notes](https://github.com/dotnet/runtime/releases) - [Commits](https://github.com/dotnet/runtime/compare/v6.0.0...v6.0.1) Updates `Microsoft.NETCore.DotNetHost` from 6.0.35 to 6.0.36 - [Release notes](https://github.com/dotnet/runtime/releases) - [Commits](https://github.com/dotnet/runtime/compare/v6.0.35...v6.0.36) --- updated-dependencies: - dependency-name: Microsoft.Extensions.Configuration.Abstractions dependency-type: direct:production update-type: version-update:semver-patch dependency-group: runtime-dependencies - dependency-name: Microsoft.Extensions.Logging dependency-type: direct:production update-type: version-update:semver-patch dependency-group: runtime-dependencies - dependency-name: Microsoft.Extensions.Logging.Abstractions dependency-type: direct:production update-type: version-update:semver-patch dependency-group: runtime-dependencies - dependency-name: Microsoft.Extensions.Configuration.Abstractions dependency-type: direct:production update-type: version-update:semver-patch dependency-group: runtime-dependencies - dependency-name: Microsoft.Extensions.Logging dependency-type: direct:production update-type: version-update:semver-patch dependency-group: runtime-dependencies - dependency-name: Microsoft.Extensions.Logging.Abstractions dependency-type: direct:production update-type: version-update:semver-patch dependency-group: runtime-dependencies - dependency-name: Microsoft.Extensions.Logging.Console dependency-type: direct:production update-type: version-update:semver-patch dependency-group: runtime-dependencies - dependency-name: Microsoft.NETCore.DotNetHost dependency-type: direct:production update-type: version-update:semver-patch dependency-group: runtime-dependencies ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- eng/dependabot/net6.0/Versions.props | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/dependabot/net6.0/Versions.props b/eng/dependabot/net6.0/Versions.props index 36b373048fc..d5ab39404e3 100644 --- a/eng/dependabot/net6.0/Versions.props +++ b/eng/dependabot/net6.0/Versions.props @@ -2,14 +2,14 @@ - 6.0.0 + 6.0.1 - 6.0.0 + 6.0.1 6.0.4 - 6.0.0 + 6.0.1 - 6.0.35 + 6.0.36 From a5076806d1c45554bc85ad5085a7cf6d8568ec4c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 14 Nov 2024 11:41:41 -0800 Subject: [PATCH 499/568] [feature/9.x] Bump the azure-sdk-dependencies group (#7664) Bumps the azure-sdk-dependencies group in /eng/dependabot/independent with 3 updates: [Azure.Core](https://github.com/Azure/azure-sdk-for-net), [Azure.Storage.Blobs](https://github.com/Azure/azure-sdk-for-net) and [Azure.Storage.Queues](https://github.com/Azure/azure-sdk-for-net). Updates `Azure.Core` from 1.44.1 to 1.44.1 - [Release notes](https://github.com/Azure/azure-sdk-for-net/releases) - [Commits](https://github.com/Azure/azure-sdk-for-net/compare/Azure.Core_1.44.1...Azure.Core_1.44.1) Updates `Azure.Storage.Blobs` from 12.22.2 to 12.23.0 - [Release notes](https://github.com/Azure/azure-sdk-for-net/releases) - [Commits](https://github.com/Azure/azure-sdk-for-net/compare/Azure.Storage.Blobs_12.22.2...Azure.Storage.Blobs_12.23.0) Updates `Azure.Core` from 1.44.1 to 1.44.1 - [Release notes](https://github.com/Azure/azure-sdk-for-net/releases) - [Commits](https://github.com/Azure/azure-sdk-for-net/compare/Azure.Core_1.44.1...Azure.Core_1.44.1) Updates `Azure.Storage.Queues` from 12.20.1 to 12.21.0 - [Release notes](https://github.com/Azure/azure-sdk-for-net/releases) - [Commits](https://github.com/Azure/azure-sdk-for-net/compare/Azure.Storage.Queues_12.20.1...Azure.Storage.Queues_12.21.0) --- updated-dependencies: - dependency-name: Azure.Core dependency-type: direct:production update-type: version-update:semver-patch dependency-group: azure-sdk-dependencies - dependency-name: Azure.Storage.Blobs dependency-type: direct:production update-type: version-update:semver-minor dependency-group: azure-sdk-dependencies - dependency-name: Azure.Core dependency-type: direct:production update-type: version-update:semver-patch dependency-group: azure-sdk-dependencies - dependency-name: Azure.Storage.Queues dependency-type: direct:production update-type: version-update:semver-minor dependency-group: azure-sdk-dependencies ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- eng/dependabot/independent/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/dependabot/independent/Versions.props b/eng/dependabot/independent/Versions.props index c1031b3033a..51a5a6f32f8 100644 --- a/eng/dependabot/independent/Versions.props +++ b/eng/dependabot/independent/Versions.props @@ -4,8 +4,8 @@ 1.44.1 1.13.1 - 12.22.2 - 12.20.1 + 12.23.0 + 12.21.0 3.3.1 1.6.22 4.3.2 From c14c8708418afdf10adbc675593393eddd517774 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 14 Nov 2024 11:43:23 -0800 Subject: [PATCH 500/568] [feature/9.x] Bump Microsoft.NETCore.DotNetHost (#7661) Bumps the runtime-dependencies group in /eng/dependabot/net8.0 with 1 update: [Microsoft.NETCore.DotNetHost](https://github.com/dotnet/runtime). Updates `Microsoft.NETCore.DotNetHost` from 8.0.10 to 8.0.11 - [Release notes](https://github.com/dotnet/runtime/releases) - [Commits](https://github.com/dotnet/runtime/compare/v8.0.10...v8.0.11) --- updated-dependencies: - dependency-name: Microsoft.NETCore.DotNetHost dependency-type: direct:production update-type: version-update:semver-patch dependency-group: runtime-dependencies ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- eng/dependabot/net8.0/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/dependabot/net8.0/Versions.props b/eng/dependabot/net8.0/Versions.props index 1488808d877..0da8a9df0a6 100644 --- a/eng/dependabot/net8.0/Versions.props +++ b/eng/dependabot/net8.0/Versions.props @@ -10,7 +10,7 @@ 8.0.1 - 8.0.10 + 8.0.11 8.0.5 From 7a56c632fef5aff1ab60b659e9d9e2e53afa751c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 15 Nov 2024 14:29:11 +0000 Subject: [PATCH 501/568] Update dependencies from https://github.com/dotnet/diagnostics build 20241114.1 (#7684) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3ff31de97c0..888a9af4050 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore 1e7a7af6d2417242b244d2a0f4f23fcce8e88d2f - + https://github.com/dotnet/diagnostics - d1d00bba1865fac0b1717c2a983aeb945274c1dc + 8c505ca6921b5f7e9b8acc234cc8f15035537ee4 - + https://github.com/dotnet/diagnostics - d1d00bba1865fac0b1717c2a983aeb945274c1dc + 8c505ca6921b5f7e9b8acc234cc8f15035537ee4 https://github.com/dotnet/command-line-api @@ -42,9 +42,9 @@ https://github.com/dotnet/arcade 3c393bbd85ae16ddddba20d0b75035b0c6f1a52d - + https://github.com/dotnet/diagnostics - d1d00bba1865fac0b1717c2a983aeb945274c1dc + 8c505ca6921b5f7e9b8acc234cc8f15035537ee4 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 1c918a03bda..a407159afcb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24528.1 - 9.0.0-preview.24563.1 - 9.0.0-preview.24563.1 + 9.0.0-preview.24564.1 + 9.0.0-preview.24564.1 9.0.0-preview.24527.2 @@ -67,7 +67,7 @@ 9.0.101-servicing.24561.8 - 1.0.556301 + 1.0.556401 $(MicrosoftNETCoreApp31Version) From ff885983b381966585c4a173a8bd90a7cd5fd282 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 15 Nov 2024 23:08:30 +0000 Subject: [PATCH 502/568] Update dependencies from https://github.com/dotnet/arcade build 20241112.13 (#7680) [feature/9.x] Update dependencies from dotnet/arcade - Merge branch 'feature/9.x' into darc-feature/9.x-3ae3703e-19b0-410b-b04b-ae6437452464 --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- global.json | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 888a9af4050..16fe5646d53 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,25 +22,25 @@ https://github.com/dotnet/roslyn-analyzers 3d61c57c73c3dd5f1f407ef9cd3414d94bf0eaf2 - + https://github.com/dotnet/arcade - 3c393bbd85ae16ddddba20d0b75035b0c6f1a52d + 1c7e09a8d9c9c9b15ba574cd6a496553505559de - + https://github.com/dotnet/arcade - 3c393bbd85ae16ddddba20d0b75035b0c6f1a52d + 1c7e09a8d9c9c9b15ba574cd6a496553505559de - + https://github.com/dotnet/arcade - 3c393bbd85ae16ddddba20d0b75035b0c6f1a52d + 1c7e09a8d9c9c9b15ba574cd6a496553505559de - + https://github.com/dotnet/arcade - 3c393bbd85ae16ddddba20d0b75035b0c6f1a52d + 1c7e09a8d9c9c9b15ba574cd6a496553505559de - + https://github.com/dotnet/arcade - 3c393bbd85ae16ddddba20d0b75035b0c6f1a52d + 1c7e09a8d9c9c9b15ba574cd6a496553505559de https://github.com/dotnet/diagnostics diff --git a/eng/Versions.props b/eng/Versions.props index a407159afcb..2b9dce21bea 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,9 +48,9 @@ --> - 9.0.0-beta.24516.2 - 9.0.0-beta.24516.2 - 9.0.0-beta.24516.2 + 9.0.0-beta.24562.13 + 9.0.0-beta.24562.13 + 9.0.0-beta.24562.13 9.0.0 9.0.0-rtm.24516.19 diff --git a/global.json b/global.json index 13ae5e67e6b..30ef1ef74e3 100644 --- a/global.json +++ b/global.json @@ -31,7 +31,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24516.2", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24516.2" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24562.13", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24562.13" } } From 0652265b06518f25202bfffac051d55900f85194 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 17 Nov 2024 14:30:31 +0000 Subject: [PATCH 503/568] Update dependencies from https://github.com/dotnet/diagnostics build 20241116.1 (#7686) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 6 +++--- eng/Versions.props | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 16fe5646d53..8b005257d23 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,11 +4,11 @@ https://github.com/dotnet/aspnetcore 1e7a7af6d2417242b244d2a0f4f23fcce8e88d2f - + https://github.com/dotnet/diagnostics 8c505ca6921b5f7e9b8acc234cc8f15035537ee4 - + https://github.com/dotnet/diagnostics 8c505ca6921b5f7e9b8acc234cc8f15035537ee4 @@ -42,7 +42,7 @@ https://github.com/dotnet/arcade 1c7e09a8d9c9c9b15ba574cd6a496553505559de - + https://github.com/dotnet/diagnostics 8c505ca6921b5f7e9b8acc234cc8f15035537ee4 diff --git a/eng/Versions.props b/eng/Versions.props index 2b9dce21bea..8810e9a6494 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24528.1 - 9.0.0-preview.24564.1 - 9.0.0-preview.24564.1 + 9.0.0-preview.24566.1 + 9.0.0-preview.24566.1 9.0.0-preview.24527.2 @@ -67,7 +67,7 @@ 9.0.101-servicing.24561.8 - 1.0.556401 + 1.0.556601 $(MicrosoftNETCoreApp31Version) From 849fb3a0417badce30d3ae1849a15d8793bf13f7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 19 Nov 2024 16:56:39 -0800 Subject: [PATCH 504/568] [feature/9.x] Bump the identity-dependencies group (#7691) Bumps the identity-dependencies group in /eng/dependabot/independent with 3 updates: [Azure.Core](https://github.com/Azure/azure-sdk-for-net), [Azure.Identity](https://github.com/Azure/azure-sdk-for-net) and [Microsoft.Identity.Web](https://github.com/AzureAD/microsoft-identity-web). Updates `Azure.Core` from 1.44.1 to 1.38.0 - [Release notes](https://github.com/Azure/azure-sdk-for-net/releases) - [Commits](https://github.com/Azure/azure-sdk-for-net/compare/Azure.Core_1.44.1...Azure.Core_1.38.0) Updates `Azure.Identity` from 1.13.1 to 1.11.4 - [Release notes](https://github.com/Azure/azure-sdk-for-net/releases) - [Commits](https://github.com/Azure/azure-sdk-for-net/compare/Azure.Identity_1.13.1...Azure.Identity_1.11.4) Updates `Microsoft.Identity.Web` from 3.3.1 to 3.4.0 - [Release notes](https://github.com/AzureAD/microsoft-identity-web/releases) - [Changelog](https://github.com/AzureAD/microsoft-identity-web/blob/master/changelog.md) - [Commits](https://github.com/AzureAD/microsoft-identity-web/compare/3.3.1...3.4.0) --- updated-dependencies: - dependency-name: Azure.Core dependency-type: direct:production update-type: version-update:semver-minor dependency-group: identity-dependencies - dependency-name: Azure.Identity dependency-type: direct:production update-type: version-update:semver-minor dependency-group: identity-dependencies - dependency-name: Microsoft.Identity.Web dependency-type: direct:production update-type: version-update:semver-minor dependency-group: identity-dependencies ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- eng/dependabot/independent/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/dependabot/independent/Versions.props b/eng/dependabot/independent/Versions.props index 51a5a6f32f8..2afcfe38529 100644 --- a/eng/dependabot/independent/Versions.props +++ b/eng/dependabot/independent/Versions.props @@ -6,7 +6,7 @@ 1.13.1 12.23.0 12.21.0 - 3.3.1 + 3.4.0 1.6.22 4.3.2 5.0.0 From 4c2829538c45cf61802e0d66829e4e4710b03006 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 20 Nov 2024 01:56:12 +0000 Subject: [PATCH 505/568] Update dependencies from https://github.com/dotnet/diagnostics build 20241118.1 (#7692) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8b005257d23..5c6eabe2044 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore 1e7a7af6d2417242b244d2a0f4f23fcce8e88d2f - + https://github.com/dotnet/diagnostics - 8c505ca6921b5f7e9b8acc234cc8f15035537ee4 + 1fb8e1fb79066632c7a2c67314d91b35cb5a37fe - + https://github.com/dotnet/diagnostics - 8c505ca6921b5f7e9b8acc234cc8f15035537ee4 + 1fb8e1fb79066632c7a2c67314d91b35cb5a37fe https://github.com/dotnet/command-line-api @@ -42,9 +42,9 @@ https://github.com/dotnet/arcade 1c7e09a8d9c9c9b15ba574cd6a496553505559de - + https://github.com/dotnet/diagnostics - 8c505ca6921b5f7e9b8acc234cc8f15035537ee4 + 1fb8e1fb79066632c7a2c67314d91b35cb5a37fe https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 8810e9a6494..c42504f4fc4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24528.1 - 9.0.0-preview.24566.1 - 9.0.0-preview.24566.1 + 9.0.0-preview.24568.1 + 9.0.0-preview.24568.1 9.0.0-preview.24527.2 @@ -67,7 +67,7 @@ 9.0.101-servicing.24561.8 - 1.0.556601 + 1.0.556801 $(MicrosoftNETCoreApp31Version) From b773d9e418d1f035c22ef2eaecdd225725f86a42 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 20 Nov 2024 15:05:22 +0000 Subject: [PATCH 506/568] Update dependencies from https://github.com/dotnet/diagnostics build 20241119.1 (#7695) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5c6eabe2044..1d55912dfde 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/aspnetcore 1e7a7af6d2417242b244d2a0f4f23fcce8e88d2f - + https://github.com/dotnet/diagnostics - 1fb8e1fb79066632c7a2c67314d91b35cb5a37fe + ec3696303c9ffd01c908044d0599b3782d61c94b - + https://github.com/dotnet/diagnostics - 1fb8e1fb79066632c7a2c67314d91b35cb5a37fe + ec3696303c9ffd01c908044d0599b3782d61c94b https://github.com/dotnet/command-line-api @@ -42,9 +42,9 @@ https://github.com/dotnet/arcade 1c7e09a8d9c9c9b15ba574cd6a496553505559de - + https://github.com/dotnet/diagnostics - 1fb8e1fb79066632c7a2c67314d91b35cb5a37fe + ec3696303c9ffd01c908044d0599b3782d61c94b https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index c42504f4fc4..c1fb11fce49 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24528.1 - 9.0.0-preview.24568.1 - 9.0.0-preview.24568.1 + 9.0.0-preview.24569.1 + 9.0.0-preview.24569.1 9.0.0-preview.24527.2 @@ -67,7 +67,7 @@ 9.0.101-servicing.24561.8 - 1.0.556801 + 1.0.556901 $(MicrosoftNETCoreApp31Version) From ed2b33ce94d458bad26430c6e32d0baf0a63534c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 20 Nov 2024 15:07:58 +0000 Subject: [PATCH 507/568] Update dependencies from https://github.com/dotnet/sdk build 20241119.41 (#7696) [feature/9.x] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Runtime.win-x64: from 9.0.0 to 9.0.0 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) - Microsoft.NETCore.App.Runtime.win-x64: from 9.0.0 to 9.0.0 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) - VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0: from 9.0.0-rtm.24516.19 to 9.0.0-rtm.24529.3 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) - VS.Redist.Common.NetCore.SharedFramework.x64.9.0: from 9.0.0-rtm.24516.10 to 9.0.0-rtm.24528.9 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0) --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1d55912dfde..c35f4eb99d2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - https://github.com/dotnet/aspnetcore - 1e7a7af6d2417242b244d2a0f4f23fcce8e88d2f + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + af22effae4069a5dfb9b0735859de48820104f5b https://github.com/dotnet/diagnostics @@ -47,20 +47,20 @@ ec3696303c9ffd01c908044d0599b3782d61c94b - https://github.com/dotnet/runtime - d3981726bc8b0e179db50301daf9f22d42393096 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 - - https://github.com/dotnet/aspnetcore - 1e7a7af6d2417242b244d2a0f4f23fcce8e88d2f + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + af22effae4069a5dfb9b0735859de48820104f5b - + https://github.com/dotnet/sdk - 8e8e27079dc1f0c53add11c3ac58fd9796aa8e73 + 8e18c80a3926c2259f9d7211c5e2c5d2f53052a1 - - https://github.com/dotnet/runtime - d3981726bc8b0e179db50301daf9f22d42393096 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 diff --git a/eng/Versions.props b/eng/Versions.props index c1fb11fce49..b4b86508a76 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,7 +53,7 @@ 9.0.0-beta.24562.13 9.0.0 - 9.0.0-rtm.24516.19 + 9.0.0-rtm.24529.3 2.0.0-beta4.24528.1 @@ -63,9 +63,9 @@ 9.0.0-preview.24527.2 9.0.0 - 9.0.0-rtm.24516.10 + 9.0.0-rtm.24528.9 - 9.0.101-servicing.24561.8 + 9.0.101-servicing.24569.41 1.0.556901 From 61edaf0bcd60caae3030b7d9c6d19d2c0ffa18d8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 21 Nov 2024 14:55:51 +0000 Subject: [PATCH 508/568] Update dependencies from https://github.com/dotnet/diagnostics build 20241120.2 (#7699) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c35f4eb99d2..ac6b22c6709 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore af22effae4069a5dfb9b0735859de48820104f5b - + https://github.com/dotnet/diagnostics - ec3696303c9ffd01c908044d0599b3782d61c94b + 130c7087868e89abca80fe6060b71a56def22719 - + https://github.com/dotnet/diagnostics - ec3696303c9ffd01c908044d0599b3782d61c94b + 130c7087868e89abca80fe6060b71a56def22719 https://github.com/dotnet/command-line-api @@ -42,9 +42,9 @@ https://github.com/dotnet/arcade 1c7e09a8d9c9c9b15ba574cd6a496553505559de - + https://github.com/dotnet/diagnostics - ec3696303c9ffd01c908044d0599b3782d61c94b + 130c7087868e89abca80fe6060b71a56def22719 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index b4b86508a76..b144339ed67 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24528.1 - 9.0.0-preview.24569.1 - 9.0.0-preview.24569.1 + 9.0.0-preview.24570.2 + 9.0.0-preview.24570.2 9.0.0-preview.24527.2 @@ -67,7 +67,7 @@ 9.0.101-servicing.24569.41 - 1.0.556901 + 1.0.557002 $(MicrosoftNETCoreApp31Version) From b859b429f140abddcc339ed919eddc2a6b67265b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 21 Nov 2024 15:07:20 +0000 Subject: [PATCH 509/568] Update dependencies from https://github.com/dotnet/sdk build 20241120.18 (#7700) [feature/9.x] Update dependencies from dotnet/sdk --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ac6b22c6709..3b7e427de98 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,9 +54,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore af22effae4069a5dfb9b0735859de48820104f5b - + https://github.com/dotnet/sdk - 8e18c80a3926c2259f9d7211c5e2c5d2f53052a1 + d28b5e324997330a6ec1834400854f32283a91d4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index b144339ed67..e964f8aef38 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,7 +65,7 @@ 9.0.0 9.0.0-rtm.24528.9 - 9.0.101-servicing.24569.41 + 9.0.101-servicing.24570.18 1.0.557002 From fcee8f6e664ca4f0f741f18462033a20e5265d3a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 22 Nov 2024 15:11:33 +0000 Subject: [PATCH 510/568] Update dependencies from https://github.com/dotnet/sdk build 20241121.23 (#7702) [feature/9.x] Update dependencies from dotnet/sdk --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3b7e427de98..2aca9e9b2f6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,9 +54,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore af22effae4069a5dfb9b0735859de48820104f5b - + https://github.com/dotnet/sdk - d28b5e324997330a6ec1834400854f32283a91d4 + 9fb180fcbfa9a73fbea160c8cf8aa7a76f73ad56 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index e964f8aef38..a4015f76d8e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,7 +65,7 @@ 9.0.0 9.0.0-rtm.24528.9 - 9.0.101-servicing.24570.18 + 9.0.101-servicing.24571.23 1.0.557002 From 10d71ecd8a0419dbc9a5afd04e2fc9d3dd5b93ae Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 23 Nov 2024 14:32:42 +0000 Subject: [PATCH 511/568] Update dependencies from https://github.com/dotnet/sdk build 20241122.15 (#7706) [feature/9.x] Update dependencies from dotnet/sdk --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2aca9e9b2f6..0d7b6cdec01 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,9 +54,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore af22effae4069a5dfb9b0735859de48820104f5b - + https://github.com/dotnet/sdk - 9fb180fcbfa9a73fbea160c8cf8aa7a76f73ad56 + c1130ce1786404c71d0e6d834a8356590830db5f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index a4015f76d8e..d2d75c462f8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,7 +65,7 @@ 9.0.0 9.0.0-rtm.24528.9 - 9.0.101-servicing.24571.23 + 9.0.101-servicing.24572.15 1.0.557002 From 51765e370644e83da03f4ceafe819ee75ea399c2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 24 Nov 2024 14:52:11 +0000 Subject: [PATCH 512/568] Update dependencies from https://github.com/dotnet/sdk build 20241123.5 (#7708) [feature/9.x] Update dependencies from dotnet/sdk --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0d7b6cdec01..64cb0cbdc1f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,9 +54,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore af22effae4069a5dfb9b0735859de48820104f5b - + https://github.com/dotnet/sdk - c1130ce1786404c71d0e6d834a8356590830db5f + 5d8b9543e53c83cdd9024c9cf68ba95297bed256 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index d2d75c462f8..c43f0f667e1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,7 +65,7 @@ 9.0.0 9.0.0-rtm.24528.9 - 9.0.101-servicing.24572.15 + 9.0.101-servicing.24573.5 1.0.557002 From d3513efe1ab7717c982094f194054a34532f625d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 25 Nov 2024 14:13:59 +0000 Subject: [PATCH 513/568] Update dependencies from https://github.com/dotnet/sdk build 20241125.3 (#7710) [feature/9.x] Update dependencies from dotnet/sdk --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 64cb0cbdc1f..45a12214471 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,9 +54,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore af22effae4069a5dfb9b0735859de48820104f5b - + https://github.com/dotnet/sdk - 5d8b9543e53c83cdd9024c9cf68ba95297bed256 + 5a5ced82d4f2250921581a035f8673591b02cd4b https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index c43f0f667e1..cbf261071d3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,7 +65,7 @@ 9.0.0 9.0.0-rtm.24528.9 - 9.0.101-servicing.24573.5 + 9.0.101-servicing.24575.3 1.0.557002 From dc066e7987d7f3b5e00d38b4d86aabcdf126a9b8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 26 Nov 2024 15:21:24 +0000 Subject: [PATCH 514/568] Update dependencies from https://github.com/dotnet/sdk build 20241126.4 (#7711) [feature/9.x] Update dependencies from dotnet/sdk --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 45a12214471..ad29736a683 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,9 +54,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore af22effae4069a5dfb9b0735859de48820104f5b - + https://github.com/dotnet/sdk - 5a5ced82d4f2250921581a035f8673591b02cd4b + 5442f8aab78b0f7929f34ddc6f72896ecc8086e5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index cbf261071d3..6f8434e0b07 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,7 +65,7 @@ 9.0.0 9.0.0-rtm.24528.9 - 9.0.101-servicing.24575.3 + 9.0.102-servicing.24576.4 1.0.557002 From 604d62fbe142e9c0166d433224a2961f44662a2c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 26 Nov 2024 14:18:31 -0800 Subject: [PATCH 515/568] Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20241124.2 (#7707) Microsoft.CodeAnalysis.NetAnalyzers From Version 9.0.0-preview.24527.2 -> To Version 9.0.0-preview.24574.2 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 2 +- eng/Versions.props | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ad29736a683..158d112bdfe 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -18,7 +18,7 @@ - + https://github.com/dotnet/roslyn-analyzers 3d61c57c73c3dd5f1f407ef9cd3414d94bf0eaf2 diff --git a/eng/Versions.props b/eng/Versions.props index 6f8434e0b07..edf88bb565a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -60,7 +60,7 @@ 9.0.0-preview.24570.2 9.0.0-preview.24570.2 - 9.0.0-preview.24527.2 + 9.0.0-preview.24574.2 9.0.0 9.0.0-rtm.24528.9 From 44aa7b64778e05efaa0e3af00e22ab888f828272 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 26 Nov 2024 14:19:07 -0800 Subject: [PATCH 516/568] [feature/9.x] Update dependencies from dotnet/diagnostics (#7701) * Update dependencies from https://github.com/dotnet/diagnostics build 20241121.1 Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe , Microsoft.FileFormats From Version 9.0.0-preview.24570.2 -> To Version 9.0.0-preview.24571.1 * Update dependencies from https://github.com/dotnet/diagnostics build 20241122.1 Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe , Microsoft.FileFormats From Version 9.0.0-preview.24570.2 -> To Version 9.0.0-preview.24572.1 * Update dependencies from https://github.com/dotnet/diagnostics build 20241123.1 Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe , Microsoft.FileFormats From Version 9.0.0-preview.24570.2 -> To Version 9.0.0-preview.24573.1 * Update dependencies from https://github.com/dotnet/diagnostics build 20241124.1 Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe , Microsoft.FileFormats From Version 9.0.0-preview.24570.2 -> To Version 9.0.0-preview.24574.1 * Update dependencies from https://github.com/dotnet/diagnostics build 20241125.1 Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe , Microsoft.FileFormats From Version 9.0.0-preview.24570.2 -> To Version 9.0.0-preview.24575.1 --------- Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 158d112bdfe..d1f2ca5d191 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore af22effae4069a5dfb9b0735859de48820104f5b - + https://github.com/dotnet/diagnostics - 130c7087868e89abca80fe6060b71a56def22719 + e28b1834edf3f5072e137b75ff456f2c9d56ee5a - + https://github.com/dotnet/diagnostics - 130c7087868e89abca80fe6060b71a56def22719 + e28b1834edf3f5072e137b75ff456f2c9d56ee5a https://github.com/dotnet/command-line-api @@ -42,9 +42,9 @@ https://github.com/dotnet/arcade 1c7e09a8d9c9c9b15ba574cd6a496553505559de - + https://github.com/dotnet/diagnostics - 130c7087868e89abca80fe6060b71a56def22719 + e28b1834edf3f5072e137b75ff456f2c9d56ee5a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index edf88bb565a..cfc0e8dc550 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24528.1 - 9.0.0-preview.24570.2 - 9.0.0-preview.24570.2 + 9.0.0-preview.24575.1 + 9.0.0-preview.24575.1 9.0.0-preview.24574.2 @@ -67,7 +67,7 @@ 9.0.102-servicing.24576.4 - 1.0.557002 + 1.0.557501 $(MicrosoftNETCoreApp31Version) From bc48646e2e6f6593cd5eddbdbc990adcd6f66ca0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 27 Nov 2024 14:51:52 +0000 Subject: [PATCH 517/568] Update dependencies from https://github.com/dotnet/diagnostics build 20241126.1 (#7712) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d1f2ca5d191..247f7ae7192 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore af22effae4069a5dfb9b0735859de48820104f5b - + https://github.com/dotnet/diagnostics - e28b1834edf3f5072e137b75ff456f2c9d56ee5a + cf545e02036ff283b36d8506f8efa543799c053a - + https://github.com/dotnet/diagnostics - e28b1834edf3f5072e137b75ff456f2c9d56ee5a + cf545e02036ff283b36d8506f8efa543799c053a https://github.com/dotnet/command-line-api @@ -42,9 +42,9 @@ https://github.com/dotnet/arcade 1c7e09a8d9c9c9b15ba574cd6a496553505559de - + https://github.com/dotnet/diagnostics - e28b1834edf3f5072e137b75ff456f2c9d56ee5a + cf545e02036ff283b36d8506f8efa543799c053a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index cfc0e8dc550..1a964b3acec 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24528.1 - 9.0.0-preview.24575.1 - 9.0.0-preview.24575.1 + 9.0.0-preview.24576.1 + 9.0.0-preview.24576.1 9.0.0-preview.24574.2 @@ -67,7 +67,7 @@ 9.0.102-servicing.24576.4 - 1.0.557501 + 1.0.557601 $(MicrosoftNETCoreApp31Version) From a1d8483af3e92d857a67435364e8dd84c110e307 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 27 Nov 2024 14:54:45 +0000 Subject: [PATCH 518/568] Update dependencies from https://github.com/dotnet/sdk build 20241126.30 (#7713) [feature/9.x] Update dependencies from dotnet/sdk --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 247f7ae7192..90dc50dd990 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,9 +54,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore af22effae4069a5dfb9b0735859de48820104f5b - + https://github.com/dotnet/sdk - 5442f8aab78b0f7929f34ddc6f72896ecc8086e5 + d281819115c3f8590b6eb53f7cf12c6d692af8d3 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 1a964b3acec..eddd5782ed8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,7 +65,7 @@ 9.0.0 9.0.0-rtm.24528.9 - 9.0.102-servicing.24576.4 + 9.0.102-servicing.24576.30 1.0.557601 From e67526644dfa8891b37833bce35a70ced366be2e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 2 Dec 2024 10:33:24 -0800 Subject: [PATCH 519/568] [feature/9.x] Update dependencies from dotnet/sdk (#7714) * Update dependencies from https://github.com/dotnet/sdk build 20241127.25 VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0 From Version 9.0.102-servicing.24576.30 -> To Version 9.0.102-servicing.24577.25 * Update dependencies from https://github.com/dotnet/sdk build 20241129.1 VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0 From Version 9.0.102-servicing.24576.30 -> To Version 9.0.102-servicing.24579.1 --------- Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 90dc50dd990..c2da30965c7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,9 +54,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore af22effae4069a5dfb9b0735859de48820104f5b - + https://github.com/dotnet/sdk - d281819115c3f8590b6eb53f7cf12c6d692af8d3 + cbec38b13edc53f701225f8f087fb5a2dbfd3679 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index eddd5782ed8..e9672e88bce 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,7 +65,7 @@ 9.0.0 9.0.0-rtm.24528.9 - 9.0.102-servicing.24576.30 + 9.0.102-servicing.24579.1 1.0.557601 From 7af4da1bb410c156d4aa058ed6b0061e76d7409d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 3 Dec 2024 14:30:15 +0000 Subject: [PATCH 520/568] Update dependencies from https://github.com/dotnet/sdk build 20241202.24 (#7719) [feature/9.x] Update dependencies from dotnet/sdk --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c2da30965c7..64aca557ce1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,9 +54,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore af22effae4069a5dfb9b0735859de48820104f5b - + https://github.com/dotnet/sdk - cbec38b13edc53f701225f8f087fb5a2dbfd3679 + 1010c375303c0f2e7f38e290f721b53c8908cde4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index e9672e88bce..48ba379b34a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,7 +65,7 @@ 9.0.0 9.0.0-rtm.24528.9 - 9.0.102-servicing.24579.1 + 9.0.102-servicing.24602.24 1.0.557601 From a4d080c9e578aad5953184252e7e9de9315aace7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 4 Dec 2024 14:28:10 +0000 Subject: [PATCH 521/568] Update dependencies from https://github.com/dotnet/sdk build 20241203.22 (#7720) [feature/9.x] Update dependencies from dotnet/sdk --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 64aca557ce1..11635daf37b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,9 +54,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore af22effae4069a5dfb9b0735859de48820104f5b - + https://github.com/dotnet/sdk - 1010c375303c0f2e7f38e290f721b53c8908cde4 + a9735335a2d805c005239027b0912a59fa470729 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 48ba379b34a..58fb4651d61 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,7 +65,7 @@ 9.0.0 9.0.0-rtm.24528.9 - 9.0.102-servicing.24602.24 + 9.0.102-servicing.24603.22 1.0.557601 From 51819c347a377dd74f76be6e9aab2bf85a92f59d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 5 Dec 2024 14:57:09 +0000 Subject: [PATCH 522/568] Update dependencies from https://github.com/dotnet/sdk build 20241205.3 (#7721) [feature/9.x] Update dependencies from dotnet/sdk --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 11635daf37b..265368cdaef 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,9 +54,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore af22effae4069a5dfb9b0735859de48820104f5b - + https://github.com/dotnet/sdk - a9735335a2d805c005239027b0912a59fa470729 + 9d448155a70cbea5b9f2c88d8bdf51dedc29b297 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 58fb4651d61..1caa3533d42 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,7 +65,7 @@ 9.0.0 9.0.0-rtm.24528.9 - 9.0.102-servicing.24603.22 + 9.0.102-servicing.24605.3 1.0.557601 From 81a39555988b894d5a65565e17330350b81babb4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 6 Dec 2024 15:43:56 +0000 Subject: [PATCH 523/568] Update dependencies from https://github.com/dotnet/diagnostics build 20241205.2 (#7726) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 265368cdaef..5b14d961323 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore af22effae4069a5dfb9b0735859de48820104f5b - + https://github.com/dotnet/diagnostics - cf545e02036ff283b36d8506f8efa543799c053a + f509795aa4e4cafa9d091e7140ad77293cdcc96d - + https://github.com/dotnet/diagnostics - cf545e02036ff283b36d8506f8efa543799c053a + f509795aa4e4cafa9d091e7140ad77293cdcc96d https://github.com/dotnet/command-line-api @@ -42,9 +42,9 @@ https://github.com/dotnet/arcade 1c7e09a8d9c9c9b15ba574cd6a496553505559de - + https://github.com/dotnet/diagnostics - cf545e02036ff283b36d8506f8efa543799c053a + f509795aa4e4cafa9d091e7140ad77293cdcc96d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 1caa3533d42..e32259b35a6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24528.1 - 9.0.0-preview.24576.1 - 9.0.0-preview.24576.1 + 9.0.0-preview.24605.2 + 9.0.0-preview.24605.2 9.0.0-preview.24574.2 @@ -67,7 +67,7 @@ 9.0.102-servicing.24605.3 - 1.0.557601 + 1.0.560502 $(MicrosoftNETCoreApp31Version) From 4704b5643e7ba11b47d953670453ec77a9685ad9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 6 Dec 2024 15:54:48 +0000 Subject: [PATCH 524/568] Update dependencies from https://github.com/dotnet/sdk build 20241205.31 (#7728) [feature/9.x] Update dependencies from dotnet/sdk --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5b14d961323..4737ccd75d2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,9 +54,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore af22effae4069a5dfb9b0735859de48820104f5b - + https://github.com/dotnet/sdk - 9d448155a70cbea5b9f2c88d8bdf51dedc29b297 + 92d3e8bae1b2c04b64cb333fb78b5294fa32731a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index e32259b35a6..27626851c76 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,7 +65,7 @@ 9.0.0 9.0.0-rtm.24528.9 - 9.0.102-servicing.24605.3 + 9.0.102-servicing.24605.31 1.0.560502 From 7aa7489c53ed4b4b1f803757b627c0482e48d791 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 6 Dec 2024 14:31:03 -0800 Subject: [PATCH 525/568] [feature/9.x] Bump the identity-dependencies group (#7722) Bumps the identity-dependencies group in /eng/dependabot/independent with 3 updates: [Azure.Core](https://github.com/Azure/azure-sdk-for-net), [Azure.Identity](https://github.com/Azure/azure-sdk-for-net) and [Microsoft.Identity.Web](https://github.com/AzureAD/microsoft-identity-web). Updates `Azure.Core` from 1.44.1 to 1.38.0 - [Release notes](https://github.com/Azure/azure-sdk-for-net/releases) - [Commits](https://github.com/Azure/azure-sdk-for-net/compare/Azure.Core_1.44.1...Azure.Core_1.38.0) Updates `Azure.Identity` from 1.13.1 to 1.11.4 - [Release notes](https://github.com/Azure/azure-sdk-for-net/releases) - [Commits](https://github.com/Azure/azure-sdk-for-net/compare/Azure.Identity_1.13.1...Azure.Identity_1.11.4) Updates `Microsoft.Identity.Web` from 3.4.0 to 3.5.0 - [Release notes](https://github.com/AzureAD/microsoft-identity-web/releases) - [Changelog](https://github.com/AzureAD/microsoft-identity-web/blob/master/changelog.md) - [Commits](https://github.com/AzureAD/microsoft-identity-web/compare/3.4.0...3.5.0) --- updated-dependencies: - dependency-name: Azure.Core dependency-type: direct:production update-type: version-update:semver-minor dependency-group: identity-dependencies - dependency-name: Azure.Identity dependency-type: direct:production update-type: version-update:semver-minor dependency-group: identity-dependencies - dependency-name: Microsoft.Identity.Web dependency-type: direct:production update-type: version-update:semver-minor dependency-group: identity-dependencies ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- eng/dependabot/independent/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/dependabot/independent/Versions.props b/eng/dependabot/independent/Versions.props index 2afcfe38529..21678e52eea 100644 --- a/eng/dependabot/independent/Versions.props +++ b/eng/dependabot/independent/Versions.props @@ -6,7 +6,7 @@ 1.13.1 12.23.0 12.21.0 - 3.4.0 + 3.5.0 1.6.22 4.3.2 5.0.0 From 98a01de3d1656ee4672b820de24c8d6948ccc273 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 6 Dec 2024 14:34:14 -0800 Subject: [PATCH 526/568] Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20241205.2 (#7727) Microsoft.CodeAnalysis.NetAnalyzers From Version 9.0.0-preview.24574.2 -> To Version 9.0.0-preview.24605.2 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4737ccd75d2..2a68109ad40 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -18,9 +18,9 @@ - + https://github.com/dotnet/roslyn-analyzers - 3d61c57c73c3dd5f1f407ef9cd3414d94bf0eaf2 + 5bfaf6aea5cf9d1c924d9adc69916eac3be07880 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 27626851c76..7e33f0d2c5d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -60,7 +60,7 @@ 9.0.0-preview.24605.2 9.0.0-preview.24605.2 - 9.0.0-preview.24574.2 + 9.0.0-preview.24605.2 9.0.0 9.0.0-rtm.24528.9 From 09678edd720c9cad1757bdcaf848933c37ebb398 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 7 Dec 2024 15:03:39 +0000 Subject: [PATCH 527/568] Update dependencies from https://github.com/dotnet/diagnostics build 20241206.1 (#7733) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2a68109ad40..788e866f13d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore af22effae4069a5dfb9b0735859de48820104f5b - + https://github.com/dotnet/diagnostics - f509795aa4e4cafa9d091e7140ad77293cdcc96d + 0be2f6a5352d73652c4bd5863fa975240105facc - + https://github.com/dotnet/diagnostics - f509795aa4e4cafa9d091e7140ad77293cdcc96d + 0be2f6a5352d73652c4bd5863fa975240105facc https://github.com/dotnet/command-line-api @@ -42,9 +42,9 @@ https://github.com/dotnet/arcade 1c7e09a8d9c9c9b15ba574cd6a496553505559de - + https://github.com/dotnet/diagnostics - f509795aa4e4cafa9d091e7140ad77293cdcc96d + 0be2f6a5352d73652c4bd5863fa975240105facc https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 7e33f0d2c5d..16262ac3690 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24528.1 - 9.0.0-preview.24605.2 - 9.0.0-preview.24605.2 + 9.0.0-preview.24606.1 + 9.0.0-preview.24606.1 9.0.0-preview.24605.2 @@ -67,7 +67,7 @@ 9.0.102-servicing.24605.31 - 1.0.560502 + 1.0.560601 $(MicrosoftNETCoreApp31Version) From 08ddff93e8e8d3afdae8915c43902c1fffdc4132 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 8 Dec 2024 14:06:49 +0000 Subject: [PATCH 528/568] Update dependencies from https://github.com/dotnet/diagnostics build 20241207.1 (#7735) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 6 +++--- eng/Versions.props | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 788e866f13d..3bfa00ab36c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,11 +4,11 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore af22effae4069a5dfb9b0735859de48820104f5b - + https://github.com/dotnet/diagnostics 0be2f6a5352d73652c4bd5863fa975240105facc - + https://github.com/dotnet/diagnostics 0be2f6a5352d73652c4bd5863fa975240105facc @@ -42,7 +42,7 @@ https://github.com/dotnet/arcade 1c7e09a8d9c9c9b15ba574cd6a496553505559de - + https://github.com/dotnet/diagnostics 0be2f6a5352d73652c4bd5863fa975240105facc diff --git a/eng/Versions.props b/eng/Versions.props index 16262ac3690..7d58757780d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24528.1 - 9.0.0-preview.24606.1 - 9.0.0-preview.24606.1 + 9.0.0-preview.24607.1 + 9.0.0-preview.24607.1 9.0.0-preview.24605.2 @@ -67,7 +67,7 @@ 9.0.102-servicing.24605.31 - 1.0.560601 + 1.0.560701 $(MicrosoftNETCoreApp31Version) From 9f0920cbc5801ae581981950af2c54274e9f749a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 11 Dec 2024 13:56:11 -0800 Subject: [PATCH 529/568] [feature/9.x] Update dependencies from dotnet/diagnostics (#7738) * Update dependencies from https://github.com/dotnet/diagnostics build 20241208.1 Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe , Microsoft.FileFormats From Version 9.0.0-preview.24607.1 -> To Version 9.0.0-preview.24608.1 * Update dependencies from https://github.com/dotnet/diagnostics build 20241209.1 Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe , Microsoft.FileFormats From Version 9.0.0-preview.24607.1 -> To Version 9.0.0-preview.24609.1 --------- Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3bfa00ab36c..55ccfc7a6f1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore af22effae4069a5dfb9b0735859de48820104f5b - + https://github.com/dotnet/diagnostics - 0be2f6a5352d73652c4bd5863fa975240105facc + d1077f536993e79a013c6f97593af84cfbbf0134 - + https://github.com/dotnet/diagnostics - 0be2f6a5352d73652c4bd5863fa975240105facc + d1077f536993e79a013c6f97593af84cfbbf0134 https://github.com/dotnet/command-line-api @@ -42,9 +42,9 @@ https://github.com/dotnet/arcade 1c7e09a8d9c9c9b15ba574cd6a496553505559de - + https://github.com/dotnet/diagnostics - 0be2f6a5352d73652c4bd5863fa975240105facc + d1077f536993e79a013c6f97593af84cfbbf0134 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 7d58757780d..04624e8e4b9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24528.1 - 9.0.0-preview.24607.1 - 9.0.0-preview.24607.1 + 9.0.0-preview.24609.1 + 9.0.0-preview.24609.1 9.0.0-preview.24605.2 @@ -67,7 +67,7 @@ 9.0.102-servicing.24605.31 - 1.0.560701 + 1.0.560901 $(MicrosoftNETCoreApp31Version) From 223a18f49b29a41fefd0327c83b273284eb36007 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 11 Dec 2024 22:40:37 +0000 Subject: [PATCH 530/568] Update dependencies from https://github.com/dotnet/sdk build 20241210.2 (#7739) [feature/9.x] Update dependencies from dotnet/sdk --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 55ccfc7a6f1..18f5ddec854 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,9 +54,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore af22effae4069a5dfb9b0735859de48820104f5b - + https://github.com/dotnet/sdk - 92d3e8bae1b2c04b64cb333fb78b5294fa32731a + a345a00343aa14a693aec75a3d56fc07e99e517f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 04624e8e4b9..3d20b1b8800 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,7 +65,7 @@ 9.0.0 9.0.0-rtm.24528.9 - 9.0.102-servicing.24605.31 + 9.0.102-servicing.24610.2 1.0.560901 From 69e97e74480f8656970da82904fd2f0067323d35 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 12 Dec 2024 14:53:47 +0000 Subject: [PATCH 531/568] Update dependencies from https://github.com/dotnet/diagnostics build 20241211.1 (#7741) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 18f5ddec854..c4e2a19b5c6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore af22effae4069a5dfb9b0735859de48820104f5b - + https://github.com/dotnet/diagnostics - d1077f536993e79a013c6f97593af84cfbbf0134 + 65cf0a0e13c1b0f9a34d56ad177490472b622eb9 - + https://github.com/dotnet/diagnostics - d1077f536993e79a013c6f97593af84cfbbf0134 + 65cf0a0e13c1b0f9a34d56ad177490472b622eb9 https://github.com/dotnet/command-line-api @@ -42,9 +42,9 @@ https://github.com/dotnet/arcade 1c7e09a8d9c9c9b15ba574cd6a496553505559de - + https://github.com/dotnet/diagnostics - d1077f536993e79a013c6f97593af84cfbbf0134 + 65cf0a0e13c1b0f9a34d56ad177490472b622eb9 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 3d20b1b8800..9aeb6bb9250 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24528.1 - 9.0.0-preview.24609.1 - 9.0.0-preview.24609.1 + 9.0.0-preview.24611.1 + 9.0.0-preview.24611.1 9.0.0-preview.24605.2 @@ -67,7 +67,7 @@ 9.0.102-servicing.24610.2 - 1.0.560901 + 1.0.561101 $(MicrosoftNETCoreApp31Version) From 63e1c79984f2592fee18305d3a7e96346a273ec2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 14 Dec 2024 00:13:18 +0000 Subject: [PATCH 532/568] Update dependencies from https://github.com/dotnet/diagnostics build 20241212.2 (#7743) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 6 +++--- eng/Versions.props | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c4e2a19b5c6..0fe23662869 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,11 +4,11 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore af22effae4069a5dfb9b0735859de48820104f5b - + https://github.com/dotnet/diagnostics 65cf0a0e13c1b0f9a34d56ad177490472b622eb9 - + https://github.com/dotnet/diagnostics 65cf0a0e13c1b0f9a34d56ad177490472b622eb9 @@ -42,7 +42,7 @@ https://github.com/dotnet/arcade 1c7e09a8d9c9c9b15ba574cd6a496553505559de - + https://github.com/dotnet/diagnostics 65cf0a0e13c1b0f9a34d56ad177490472b622eb9 diff --git a/eng/Versions.props b/eng/Versions.props index 9aeb6bb9250..71aec29bdb0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24528.1 - 9.0.0-preview.24611.1 - 9.0.0-preview.24611.1 + 9.0.0-preview.24612.2 + 9.0.0-preview.24612.2 9.0.0-preview.24605.2 @@ -67,7 +67,7 @@ 9.0.102-servicing.24610.2 - 1.0.561101 + 1.0.561202 $(MicrosoftNETCoreApp31Version) From b835c6d470406526cba8918444893b5006a40142 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 15 Dec 2024 14:06:07 +0000 Subject: [PATCH 533/568] Update dependencies from https://github.com/dotnet/diagnostics build 20241214.1 (#7747) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0fe23662869..aee8c22fbec 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore af22effae4069a5dfb9b0735859de48820104f5b - + https://github.com/dotnet/diagnostics - 65cf0a0e13c1b0f9a34d56ad177490472b622eb9 + 9224312b504a630f2ece8fd1f374dcb93ed165da - + https://github.com/dotnet/diagnostics - 65cf0a0e13c1b0f9a34d56ad177490472b622eb9 + 9224312b504a630f2ece8fd1f374dcb93ed165da https://github.com/dotnet/command-line-api @@ -42,9 +42,9 @@ https://github.com/dotnet/arcade 1c7e09a8d9c9c9b15ba574cd6a496553505559de - + https://github.com/dotnet/diagnostics - 65cf0a0e13c1b0f9a34d56ad177490472b622eb9 + 9224312b504a630f2ece8fd1f374dcb93ed165da https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 71aec29bdb0..b41232d57c1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24528.1 - 9.0.0-preview.24612.2 - 9.0.0-preview.24612.2 + 9.0.0-preview.24614.1 + 9.0.0-preview.24614.1 9.0.0-preview.24605.2 @@ -67,7 +67,7 @@ 9.0.102-servicing.24610.2 - 1.0.561202 + 1.0.561401 $(MicrosoftNETCoreApp31Version) From 0c2e2640467f4dcd44660c2e9dfe4d4f6dcd87d2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 16 Dec 2024 14:10:42 +0000 Subject: [PATCH 534/568] Update dependencies from https://github.com/dotnet/diagnostics build 20241215.1 (#7750) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index aee8c22fbec..66c5abefb0e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore af22effae4069a5dfb9b0735859de48820104f5b - + https://github.com/dotnet/diagnostics - 9224312b504a630f2ece8fd1f374dcb93ed165da + 8b784e9b8939ceeaef1e4b7833d3527ac7db7f98 - + https://github.com/dotnet/diagnostics - 9224312b504a630f2ece8fd1f374dcb93ed165da + 8b784e9b8939ceeaef1e4b7833d3527ac7db7f98 https://github.com/dotnet/command-line-api @@ -42,9 +42,9 @@ https://github.com/dotnet/arcade 1c7e09a8d9c9c9b15ba574cd6a496553505559de - + https://github.com/dotnet/diagnostics - 9224312b504a630f2ece8fd1f374dcb93ed165da + 8b784e9b8939ceeaef1e4b7833d3527ac7db7f98 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index b41232d57c1..8259aa864c6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24528.1 - 9.0.0-preview.24614.1 - 9.0.0-preview.24614.1 + 9.0.0-preview.24615.1 + 9.0.0-preview.24615.1 9.0.0-preview.24605.2 @@ -67,7 +67,7 @@ 9.0.102-servicing.24610.2 - 1.0.561401 + 1.0.561501 $(MicrosoftNETCoreApp31Version) From 8a4cd9b358b8ba50b88c2e31b717b52467128bdf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 17 Dec 2024 15:03:41 +0000 Subject: [PATCH 535/568] Update dependencies from https://github.com/dotnet/diagnostics build 20241216.1 (#7752) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 66c5abefb0e..440111d239a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore af22effae4069a5dfb9b0735859de48820104f5b - + https://github.com/dotnet/diagnostics - 8b784e9b8939ceeaef1e4b7833d3527ac7db7f98 + bbb125da63a0a17ffb55037923c5c64a440d0bea - + https://github.com/dotnet/diagnostics - 8b784e9b8939ceeaef1e4b7833d3527ac7db7f98 + bbb125da63a0a17ffb55037923c5c64a440d0bea https://github.com/dotnet/command-line-api @@ -42,9 +42,9 @@ https://github.com/dotnet/arcade 1c7e09a8d9c9c9b15ba574cd6a496553505559de - + https://github.com/dotnet/diagnostics - 8b784e9b8939ceeaef1e4b7833d3527ac7db7f98 + bbb125da63a0a17ffb55037923c5c64a440d0bea https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 8259aa864c6..8d9d9450771 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24528.1 - 9.0.0-preview.24615.1 - 9.0.0-preview.24615.1 + 9.0.0-preview.24616.1 + 9.0.0-preview.24616.1 9.0.0-preview.24605.2 @@ -67,7 +67,7 @@ 9.0.102-servicing.24610.2 - 1.0.561501 + 1.0.561601 $(MicrosoftNETCoreApp31Version) From df13f844a277d6840e4cd9a750bcaa9b1cbcc6f7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 31 Dec 2024 16:31:45 -0800 Subject: [PATCH 536/568] Update dependencies from https://github.com/dotnet/diagnostics build 20241219.1 (#7756) Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe , Microsoft.FileFormats From Version 9.0.0-preview.24616.1 -> To Version 9.0.0-preview.24619.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 440111d239a..d26c6bf1c46 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore af22effae4069a5dfb9b0735859de48820104f5b - + https://github.com/dotnet/diagnostics - bbb125da63a0a17ffb55037923c5c64a440d0bea + 1cbd0e2223b58ba54755dc022dba54a4027e01d2 - + https://github.com/dotnet/diagnostics - bbb125da63a0a17ffb55037923c5c64a440d0bea + 1cbd0e2223b58ba54755dc022dba54a4027e01d2 https://github.com/dotnet/command-line-api @@ -42,9 +42,9 @@ https://github.com/dotnet/arcade 1c7e09a8d9c9c9b15ba574cd6a496553505559de - + https://github.com/dotnet/diagnostics - bbb125da63a0a17ffb55037923c5c64a440d0bea + 1cbd0e2223b58ba54755dc022dba54a4027e01d2 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 8d9d9450771..5c39bfe384f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24528.1 - 9.0.0-preview.24616.1 - 9.0.0-preview.24616.1 + 9.0.0-preview.24619.1 + 9.0.0-preview.24619.1 9.0.0-preview.24605.2 @@ -67,7 +67,7 @@ 9.0.102-servicing.24610.2 - 1.0.561601 + 1.0.561901 $(MicrosoftNETCoreApp31Version) From 6cc2fda8e10ed1dd060ab80f2fa70d38b94a5374 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 31 Dec 2024 16:34:38 -0800 Subject: [PATCH 537/568] [feature/9.x] Bump Microsoft.OpenApi.Readers (#7762) Bumps [Microsoft.OpenApi.Readers](https://github.com/Microsoft/OpenAPI.NET) from 1.6.22 to 1.6.23. - [Release notes](https://github.com/Microsoft/OpenAPI.NET/releases) - [Commits](https://github.com/Microsoft/OpenAPI.NET/compare/1.6.22...1.6.23) --- updated-dependencies: - dependency-name: Microsoft.OpenApi.Readers dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- eng/dependabot/independent/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/dependabot/independent/Versions.props b/eng/dependabot/independent/Versions.props index 21678e52eea..8cb8137b2f3 100644 --- a/eng/dependabot/independent/Versions.props +++ b/eng/dependabot/independent/Versions.props @@ -7,7 +7,7 @@ 12.23.0 12.21.0 3.5.0 - 1.6.22 + 1.6.23 4.3.2 5.0.0 From 12aefa6c33e8d0331056289d583e34144f82e5d5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 31 Dec 2024 16:35:46 -0800 Subject: [PATCH 538/568] Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20241229.2 (#7769) Microsoft.CodeAnalysis.NetAnalyzers From Version 9.0.0-preview.24605.2 -> To Version 9.0.0-preview.24629.2 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 2 +- eng/Versions.props | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d26c6bf1c46..2413eb0c7f3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -18,7 +18,7 @@ - + https://github.com/dotnet/roslyn-analyzers 5bfaf6aea5cf9d1c924d9adc69916eac3be07880 diff --git a/eng/Versions.props b/eng/Versions.props index 5c39bfe384f..66a4a48bd32 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -60,7 +60,7 @@ 9.0.0-preview.24619.1 9.0.0-preview.24619.1 - 9.0.0-preview.24605.2 + 9.0.0-preview.24629.2 9.0.0 9.0.0-rtm.24528.9 From 58448c1fc3cea51779ce8387315fad8dd8c90fda Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 1 Jan 2025 01:52:44 +0000 Subject: [PATCH 539/568] Update dependencies from https://github.com/dotnet/diagnostics build 20241229.1 (#7772) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2413eb0c7f3..7c00244aad4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore af22effae4069a5dfb9b0735859de48820104f5b - + https://github.com/dotnet/diagnostics - 1cbd0e2223b58ba54755dc022dba54a4027e01d2 + 87029b59d2b719cb94320f29f71b7caecb142654 - + https://github.com/dotnet/diagnostics - 1cbd0e2223b58ba54755dc022dba54a4027e01d2 + 87029b59d2b719cb94320f29f71b7caecb142654 https://github.com/dotnet/command-line-api @@ -42,9 +42,9 @@ https://github.com/dotnet/arcade 1c7e09a8d9c9c9b15ba574cd6a496553505559de - + https://github.com/dotnet/diagnostics - 1cbd0e2223b58ba54755dc022dba54a4027e01d2 + 87029b59d2b719cb94320f29f71b7caecb142654 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 66a4a48bd32..42a824b815b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24528.1 - 9.0.0-preview.24619.1 - 9.0.0-preview.24619.1 + 9.0.0-preview.24629.1 + 9.0.0-preview.24629.1 9.0.0-preview.24629.2 @@ -67,7 +67,7 @@ 9.0.102-servicing.24610.2 - 1.0.561901 + 1.0.562901 $(MicrosoftNETCoreApp31Version) From 242362da16556d6727fb1e30e5d8f40e8fd8c8f7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 1 Jan 2025 02:47:12 +0000 Subject: [PATCH 540/568] [feature/9.x] Update dependencies from dotnet/diagnostics (#7773) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7c00244aad4..5b52e12620f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore af22effae4069a5dfb9b0735859de48820104f5b - + https://github.com/dotnet/diagnostics - 87029b59d2b719cb94320f29f71b7caecb142654 + 9e9d881c9fb86cb4b63db770362a2ee7b122c91d - + https://github.com/dotnet/diagnostics - 87029b59d2b719cb94320f29f71b7caecb142654 + 9e9d881c9fb86cb4b63db770362a2ee7b122c91d https://github.com/dotnet/command-line-api @@ -42,9 +42,9 @@ https://github.com/dotnet/arcade 1c7e09a8d9c9c9b15ba574cd6a496553505559de - + https://github.com/dotnet/diagnostics - 87029b59d2b719cb94320f29f71b7caecb142654 + 9e9d881c9fb86cb4b63db770362a2ee7b122c91d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 42a824b815b..6620fb90437 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24528.1 - 9.0.0-preview.24629.1 - 9.0.0-preview.24629.1 + 9.0.0-preview.24630.1 + 9.0.0-preview.24630.1 9.0.0-preview.24629.2 @@ -67,7 +67,7 @@ 9.0.102-servicing.24610.2 - 1.0.562901 + 1.0.563001 $(MicrosoftNETCoreApp31Version) From a643daf9b6752c664b6f6abab344fcb055cd338e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 2 Jan 2025 23:12:16 -0800 Subject: [PATCH 541/568] [feature/9.x] Update dependencies from dotnet/diagnostics (#7774) * Update dependencies from https://github.com/dotnet/diagnostics build 20241228.1 Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe , Microsoft.FileFormats From Version 9.0.0-preview.24630.1 -> To Version 9.0.0-preview.24628.1 * Update dependencies from https://github.com/dotnet/diagnostics build 20241231.1 Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe , Microsoft.FileFormats From Version 9.0.0-preview.24630.1 -> To Version 9.0.0-preview.24631.1 * Update dependencies from https://github.com/dotnet/diagnostics build 20250101.1 Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe , Microsoft.FileFormats From Version 9.0.0-preview.24630.1 -> To Version 9.0.0-preview.25051.1 * Update dependencies from https://github.com/dotnet/diagnostics build 20250102.1 Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe , Microsoft.FileFormats From Version 9.0.0-preview.24630.1 -> To Version 9.0.0-preview.25052.1 --------- Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5b52e12620f..1662d208c56 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore af22effae4069a5dfb9b0735859de48820104f5b - + https://github.com/dotnet/diagnostics - 9e9d881c9fb86cb4b63db770362a2ee7b122c91d + 116d31bdbac3c9b5a63045b4d836d99a728a4c44 - + https://github.com/dotnet/diagnostics - 9e9d881c9fb86cb4b63db770362a2ee7b122c91d + 116d31bdbac3c9b5a63045b4d836d99a728a4c44 https://github.com/dotnet/command-line-api @@ -42,9 +42,9 @@ https://github.com/dotnet/arcade 1c7e09a8d9c9c9b15ba574cd6a496553505559de - + https://github.com/dotnet/diagnostics - 9e9d881c9fb86cb4b63db770362a2ee7b122c91d + 116d31bdbac3c9b5a63045b4d836d99a728a4c44 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 6620fb90437..43b6da8cf35 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24528.1 - 9.0.0-preview.24630.1 - 9.0.0-preview.24630.1 + 9.0.0-preview.25052.1 + 9.0.0-preview.25052.1 9.0.0-preview.24629.2 @@ -67,7 +67,7 @@ 9.0.102-servicing.24610.2 - 1.0.563001 + 1.0.605201 $(MicrosoftNETCoreApp31Version) From a1df6b6a999eaf6f614034a407b6d2a645781f97 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 6 Jan 2025 05:02:16 +0000 Subject: [PATCH 542/568] Update dependencies from https://github.com/dotnet/diagnostics build 20250104.1 (#7781) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1662d208c56..04ae27bf5fc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore af22effae4069a5dfb9b0735859de48820104f5b - + https://github.com/dotnet/diagnostics - 116d31bdbac3c9b5a63045b4d836d99a728a4c44 + 1f37640e0b4bcadc754b5fbbe8d803cc71753a17 - + https://github.com/dotnet/diagnostics - 116d31bdbac3c9b5a63045b4d836d99a728a4c44 + 1f37640e0b4bcadc754b5fbbe8d803cc71753a17 https://github.com/dotnet/command-line-api @@ -42,9 +42,9 @@ https://github.com/dotnet/arcade 1c7e09a8d9c9c9b15ba574cd6a496553505559de - + https://github.com/dotnet/diagnostics - 116d31bdbac3c9b5a63045b4d836d99a728a4c44 + 1f37640e0b4bcadc754b5fbbe8d803cc71753a17 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 43b6da8cf35..ea304d451a5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24528.1 - 9.0.0-preview.25052.1 - 9.0.0-preview.25052.1 + 9.0.0-preview.25054.1 + 9.0.0-preview.25054.1 9.0.0-preview.24629.2 @@ -67,7 +67,7 @@ 9.0.102-servicing.24610.2 - 1.0.605201 + 1.0.605401 $(MicrosoftNETCoreApp31Version) From 25d2ebdd3b2910e03c992e754777e7a7fc09a1cd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 6 Jan 2025 16:32:13 +0000 Subject: [PATCH 543/568] Update dependencies from https://github.com/dotnet/diagnostics build 20250105.1 (#7784) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 04ae27bf5fc..e7a33c27723 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore af22effae4069a5dfb9b0735859de48820104f5b - + https://github.com/dotnet/diagnostics - 1f37640e0b4bcadc754b5fbbe8d803cc71753a17 + c9233435fbe4a262c4b4b0e72405a495a8663d5d - + https://github.com/dotnet/diagnostics - 1f37640e0b4bcadc754b5fbbe8d803cc71753a17 + c9233435fbe4a262c4b4b0e72405a495a8663d5d https://github.com/dotnet/command-line-api @@ -42,9 +42,9 @@ https://github.com/dotnet/arcade 1c7e09a8d9c9c9b15ba574cd6a496553505559de - + https://github.com/dotnet/diagnostics - 1f37640e0b4bcadc754b5fbbe8d803cc71753a17 + c9233435fbe4a262c4b4b0e72405a495a8663d5d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index ea304d451a5..c761faee48a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24528.1 - 9.0.0-preview.25054.1 - 9.0.0-preview.25054.1 + 9.0.0-preview.25055.1 + 9.0.0-preview.25055.1 9.0.0-preview.24629.2 @@ -67,7 +67,7 @@ 9.0.102-servicing.24610.2 - 1.0.605401 + 1.0.605501 $(MicrosoftNETCoreApp31Version) From b794433cd475208b2b32ef1a4d71ec5cb76b6f8d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 7 Jan 2025 06:14:31 +0000 Subject: [PATCH 544/568] Update dependencies from https://github.com/dotnet/diagnostics build 20250106.1 (#7786) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e7a33c27723..b79db81516c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore af22effae4069a5dfb9b0735859de48820104f5b - + https://github.com/dotnet/diagnostics - c9233435fbe4a262c4b4b0e72405a495a8663d5d + 22f5efe73633735cfc03246404e83f0797b61422 - + https://github.com/dotnet/diagnostics - c9233435fbe4a262c4b4b0e72405a495a8663d5d + 22f5efe73633735cfc03246404e83f0797b61422 https://github.com/dotnet/command-line-api @@ -42,9 +42,9 @@ https://github.com/dotnet/arcade 1c7e09a8d9c9c9b15ba574cd6a496553505559de - + https://github.com/dotnet/diagnostics - c9233435fbe4a262c4b4b0e72405a495a8663d5d + 22f5efe73633735cfc03246404e83f0797b61422 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index c761faee48a..ec705922d90 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24528.1 - 9.0.0-preview.25055.1 - 9.0.0-preview.25055.1 + 9.0.0-preview.25056.1 + 9.0.0-preview.25056.1 9.0.0-preview.24629.2 @@ -67,7 +67,7 @@ 9.0.102-servicing.24610.2 - 1.0.605501 + 1.0.605601 $(MicrosoftNETCoreApp31Version) From 70530ac8a1b095e478a4729f39a6922227a64398 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 7 Jan 2025 20:48:53 +0000 Subject: [PATCH 545/568] Restore branch-specific files --- eng/common/cross/toolchain.cmake | 65 +++++++++++++++++--------------- eng/common/tools.ps1 | 2 +- eng/common/tools.sh | 2 +- 3 files changed, 37 insertions(+), 32 deletions(-) diff --git a/eng/common/cross/toolchain.cmake b/eng/common/cross/toolchain.cmake index 1398610e328..9a4e285a5ae 100644 --- a/eng/common/cross/toolchain.cmake +++ b/eng/common/cross/toolchain.cmake @@ -40,7 +40,7 @@ if(TARGET_ARCH_NAME STREQUAL "arm") set(TOOLCHAIN "arm-linux-gnueabihf") endif() if(TIZEN) - set(TIZEN_TOOLCHAIN "armv7hl-tizen-linux-gnueabihf") + set(TIZEN_TOOLCHAIN "armv7hl-tizen-linux-gnueabihf/9.2.0") endif() elseif(TARGET_ARCH_NAME STREQUAL "arm64") set(CMAKE_SYSTEM_PROCESSOR aarch64) @@ -49,7 +49,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "arm64") elseif(LINUX) set(TOOLCHAIN "aarch64-linux-gnu") if(TIZEN) - set(TIZEN_TOOLCHAIN "aarch64-tizen-linux-gnu") + set(TIZEN_TOOLCHAIN "aarch64-tizen-linux-gnu/9.2.0") endif() elseif(FREEBSD) set(triple "aarch64-unknown-freebsd12") @@ -58,7 +58,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "armel") set(CMAKE_SYSTEM_PROCESSOR armv7l) set(TOOLCHAIN "arm-linux-gnueabi") if(TIZEN) - set(TIZEN_TOOLCHAIN "armv7l-tizen-linux-gnueabi") + set(TIZEN_TOOLCHAIN "armv7l-tizen-linux-gnueabi/9.2.0") endif() elseif(TARGET_ARCH_NAME STREQUAL "armv6") set(CMAKE_SYSTEM_PROCESSOR armv6l) @@ -98,7 +98,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "x64") elseif(LINUX) set(TOOLCHAIN "x86_64-linux-gnu") if(TIZEN) - set(TIZEN_TOOLCHAIN "x86_64-tizen-linux-gnu") + set(TIZEN_TOOLCHAIN "x86_64-tizen-linux-gnu/9.2.0") endif() elseif(FREEBSD) set(triple "x86_64-unknown-freebsd12") @@ -115,7 +115,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "x86") set(TOOLCHAIN "i686-linux-gnu") endif() if(TIZEN) - set(TIZEN_TOOLCHAIN "i586-tizen-linux-gnu") + set(TIZEN_TOOLCHAIN "i586-tizen-linux-gnu/9.2.0") endif() else() message(FATAL_ERROR "Arch is ${TARGET_ARCH_NAME}. Only arm, arm64, armel, armv6, ppc64le, riscv64, s390x, x64 and x86 are supported!") @@ -127,25 +127,30 @@ endif() # Specify include paths if(TIZEN) - function(find_toolchain_dir prefix) - # Dynamically find the version subdirectory - file(GLOB DIRECTORIES "${prefix}/*") - list(GET DIRECTORIES 0 FIRST_MATCH) - get_filename_component(TOOLCHAIN_VERSION ${FIRST_MATCH} NAME) - - set(TIZEN_TOOLCHAIN_PATH "${prefix}/${TOOLCHAIN_VERSION}" PARENT_SCOPE) - endfunction() - - if(TARGET_ARCH_NAME MATCHES "^(arm|armel|x86)$") - find_toolchain_dir("${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}") - else() - find_toolchain_dir("${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}") + if(TARGET_ARCH_NAME STREQUAL "arm") + include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/) + include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/armv7hl-tizen-linux-gnueabihf) + endif() + if(TARGET_ARCH_NAME STREQUAL "armel") + include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/) + include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/armv7l-tizen-linux-gnueabi) + endif() + if(TARGET_ARCH_NAME STREQUAL "arm64") + include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/) + include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/aarch64-tizen-linux-gnu) + endif() + if(TARGET_ARCH_NAME STREQUAL "x86") + include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/) + include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/i586-tizen-linux-gnu) + endif() + if(TARGET_ARCH_NAME STREQUAL "x64") + include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/) + include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/x86_64-tizen-linux-gnu) + endif() + if(TARGET_ARCH_NAME STREQUAL "riscv64") + include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/) + include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/riscv64-tizen-linux-gnu) endif() - - message(STATUS "TIZEN_TOOLCHAIN_PATH set to: ${TIZEN_TOOLCHAIN_PATH}") - - include_directories(SYSTEM ${TIZEN_TOOLCHAIN_PATH}/include/c++) - include_directories(SYSTEM ${TIZEN_TOOLCHAIN_PATH}/include/c++/${TIZEN_TOOLCHAIN}) endif() if(ANDROID) @@ -267,21 +272,21 @@ endif() if(TARGET_ARCH_NAME MATCHES "^(arm|armel)$") if(TIZEN) - add_toolchain_linker_flag("-B${TIZEN_TOOLCHAIN_PATH}") + add_toolchain_linker_flag("-B${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}") add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib") add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib") - add_toolchain_linker_flag("-L${TIZEN_TOOLCHAIN_PATH}") + add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}") endif() elseif(TARGET_ARCH_NAME MATCHES "^(arm64|x64|riscv64)$") if(TIZEN) - add_toolchain_linker_flag("-B${TIZEN_TOOLCHAIN_PATH}") + add_toolchain_linker_flag("-B${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}") add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib64") add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib64") - add_toolchain_linker_flag("-L${TIZEN_TOOLCHAIN_PATH}") + add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}") add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/lib64") add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/usr/lib64") - add_toolchain_linker_flag("-Wl,--rpath-link=${TIZEN_TOOLCHAIN_PATH}") + add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}") endif() elseif(TARGET_ARCH_NAME STREQUAL "s390x") add_toolchain_linker_flag("--target=${TOOLCHAIN}") @@ -292,10 +297,10 @@ elseif(TARGET_ARCH_NAME STREQUAL "x86") endif() add_toolchain_linker_flag(-m32) if(TIZEN) - add_toolchain_linker_flag("-B${TIZEN_TOOLCHAIN_PATH}") + add_toolchain_linker_flag("-B${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}") add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib") add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib") - add_toolchain_linker_flag("-L${TIZEN_TOOLCHAIN_PATH}") + add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}") endif() elseif(ILLUMOS) add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib/amd64") diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 3f5a97e98bb..22954477a57 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -320,7 +320,7 @@ function InstallDotNet([string] $dotnetRoot, $variations += @($installParameters) $dotnetBuilds = $installParameters.Clone() - $dotnetbuilds.AzureFeed = "https://ci.dot.net/public" + $dotnetbuilds.AzureFeed = "https://dotnetbuilds.azureedge.net/public" $variations += @($dotnetBuilds) if ($runtimeSourceFeed) { diff --git a/eng/common/tools.sh b/eng/common/tools.sh index 1159726a10f..00473c9f918 100644 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -232,7 +232,7 @@ function InstallDotNet { local public_location=("${installParameters[@]}") variations+=(public_location) - local dotnetbuilds=("${installParameters[@]}" --azure-feed "https://ci.dot.net/public") + local dotnetbuilds=("${installParameters[@]}" --azure-feed "https://dotnetbuilds.azureedge.net/public") variations+=(dotnetbuilds) if [[ -n "${6:-}" ]]; then From 907fe3ef5be0538316d665079b2100e0149e6c77 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 8 Jan 2025 08:47:41 -0800 Subject: [PATCH 546/568] Update dependencies from https://github.com/dotnet/arcade build 20241223.3 (#7777) Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.24562.13 -> To Version 9.0.0-beta.24623.3 Co-authored-by: dotnet-maestro[bot] Co-authored-by: kkeirstead <85592574+kkeirstead@users.noreply.github.com> --- eng/Version.Details.xml | 20 +++++----- eng/Versions.props | 6 +-- eng/common/cross/toolchain.cmake | 67 +++++++++++++++----------------- eng/common/sdk-task.ps1 | 2 +- eng/common/tools.ps1 | 6 +-- eng/common/tools.sh | 2 +- global.json | 6 +-- 7 files changed, 52 insertions(+), 57 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b79db81516c..5b9078141ac 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,25 +22,25 @@ https://github.com/dotnet/roslyn-analyzers 5bfaf6aea5cf9d1c924d9adc69916eac3be07880 - + https://github.com/dotnet/arcade - 1c7e09a8d9c9c9b15ba574cd6a496553505559de + e0e05154656254a735ebf19ffa5a37a8b915039b - + https://github.com/dotnet/arcade - 1c7e09a8d9c9c9b15ba574cd6a496553505559de + e0e05154656254a735ebf19ffa5a37a8b915039b - + https://github.com/dotnet/arcade - 1c7e09a8d9c9c9b15ba574cd6a496553505559de + e0e05154656254a735ebf19ffa5a37a8b915039b - + https://github.com/dotnet/arcade - 1c7e09a8d9c9c9b15ba574cd6a496553505559de + e0e05154656254a735ebf19ffa5a37a8b915039b - + https://github.com/dotnet/arcade - 1c7e09a8d9c9c9b15ba574cd6a496553505559de + e0e05154656254a735ebf19ffa5a37a8b915039b https://github.com/dotnet/diagnostics diff --git a/eng/Versions.props b/eng/Versions.props index ec705922d90..ead03a6b03e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,9 +48,9 @@ --> - 9.0.0-beta.24562.13 - 9.0.0-beta.24562.13 - 9.0.0-beta.24562.13 + 9.0.0-beta.24623.3 + 9.0.0-beta.24623.3 + 9.0.0-beta.24623.3 9.0.0 9.0.0-rtm.24529.3 diff --git a/eng/common/cross/toolchain.cmake b/eng/common/cross/toolchain.cmake index 9a4e285a5ae..9a7ecfbd42c 100644 --- a/eng/common/cross/toolchain.cmake +++ b/eng/common/cross/toolchain.cmake @@ -40,7 +40,7 @@ if(TARGET_ARCH_NAME STREQUAL "arm") set(TOOLCHAIN "arm-linux-gnueabihf") endif() if(TIZEN) - set(TIZEN_TOOLCHAIN "armv7hl-tizen-linux-gnueabihf/9.2.0") + set(TIZEN_TOOLCHAIN "armv7hl-tizen-linux-gnueabihf") endif() elseif(TARGET_ARCH_NAME STREQUAL "arm64") set(CMAKE_SYSTEM_PROCESSOR aarch64) @@ -49,7 +49,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "arm64") elseif(LINUX) set(TOOLCHAIN "aarch64-linux-gnu") if(TIZEN) - set(TIZEN_TOOLCHAIN "aarch64-tizen-linux-gnu/9.2.0") + set(TIZEN_TOOLCHAIN "aarch64-tizen-linux-gnu") endif() elseif(FREEBSD) set(triple "aarch64-unknown-freebsd12") @@ -58,7 +58,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "armel") set(CMAKE_SYSTEM_PROCESSOR armv7l) set(TOOLCHAIN "arm-linux-gnueabi") if(TIZEN) - set(TIZEN_TOOLCHAIN "armv7l-tizen-linux-gnueabi/9.2.0") + set(TIZEN_TOOLCHAIN "armv7l-tizen-linux-gnueabi") endif() elseif(TARGET_ARCH_NAME STREQUAL "armv6") set(CMAKE_SYSTEM_PROCESSOR armv6l) @@ -81,7 +81,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "riscv64") else() set(TOOLCHAIN "riscv64-linux-gnu") if(TIZEN) - set(TIZEN_TOOLCHAIN "riscv64-tizen-linux-gnu/13.1.0") + set(TIZEN_TOOLCHAIN "riscv64-tizen-linux-gnu") endif() endif() elseif(TARGET_ARCH_NAME STREQUAL "s390x") @@ -98,7 +98,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "x64") elseif(LINUX) set(TOOLCHAIN "x86_64-linux-gnu") if(TIZEN) - set(TIZEN_TOOLCHAIN "x86_64-tizen-linux-gnu/9.2.0") + set(TIZEN_TOOLCHAIN "x86_64-tizen-linux-gnu") endif() elseif(FREEBSD) set(triple "x86_64-unknown-freebsd12") @@ -115,7 +115,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "x86") set(TOOLCHAIN "i686-linux-gnu") endif() if(TIZEN) - set(TIZEN_TOOLCHAIN "i586-tizen-linux-gnu/9.2.0") + set(TIZEN_TOOLCHAIN "i586-tizen-linux-gnu") endif() else() message(FATAL_ERROR "Arch is ${TARGET_ARCH_NAME}. Only arm, arm64, armel, armv6, ppc64le, riscv64, s390x, x64 and x86 are supported!") @@ -127,30 +127,25 @@ endif() # Specify include paths if(TIZEN) - if(TARGET_ARCH_NAME STREQUAL "arm") - include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/) - include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/armv7hl-tizen-linux-gnueabihf) - endif() - if(TARGET_ARCH_NAME STREQUAL "armel") - include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/) - include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/armv7l-tizen-linux-gnueabi) - endif() - if(TARGET_ARCH_NAME STREQUAL "arm64") - include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/) - include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/aarch64-tizen-linux-gnu) - endif() - if(TARGET_ARCH_NAME STREQUAL "x86") - include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/) - include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/i586-tizen-linux-gnu) - endif() - if(TARGET_ARCH_NAME STREQUAL "x64") - include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/) - include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/x86_64-tizen-linux-gnu) - endif() - if(TARGET_ARCH_NAME STREQUAL "riscv64") - include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/) - include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/riscv64-tizen-linux-gnu) + function(find_toolchain_dir prefix) + # Dynamically find the version subdirectory + file(GLOB DIRECTORIES "${prefix}/*") + list(GET DIRECTORIES 0 FIRST_MATCH) + get_filename_component(TOOLCHAIN_VERSION ${FIRST_MATCH} NAME) + + set(TIZEN_TOOLCHAIN_PATH "${prefix}/${TOOLCHAIN_VERSION}" PARENT_SCOPE) + endfunction() + + if(TARGET_ARCH_NAME MATCHES "^(arm|armel|x86)$") + find_toolchain_dir("${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}") + else() + find_toolchain_dir("${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}") endif() + + message(STATUS "TIZEN_TOOLCHAIN_PATH set to: ${TIZEN_TOOLCHAIN_PATH}") + + include_directories(SYSTEM ${TIZEN_TOOLCHAIN_PATH}/include/c++) + include_directories(SYSTEM ${TIZEN_TOOLCHAIN_PATH}/include/c++/${TIZEN_TOOLCHAIN}) endif() if(ANDROID) @@ -272,21 +267,21 @@ endif() if(TARGET_ARCH_NAME MATCHES "^(arm|armel)$") if(TIZEN) - add_toolchain_linker_flag("-B${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}") + add_toolchain_linker_flag("-B${TIZEN_TOOLCHAIN_PATH}") add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib") add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib") - add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}") + add_toolchain_linker_flag("-L${TIZEN_TOOLCHAIN_PATH}") endif() elseif(TARGET_ARCH_NAME MATCHES "^(arm64|x64|riscv64)$") if(TIZEN) - add_toolchain_linker_flag("-B${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}") + add_toolchain_linker_flag("-B${TIZEN_TOOLCHAIN_PATH}") add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib64") add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib64") - add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}") + add_toolchain_linker_flag("-L${TIZEN_TOOLCHAIN_PATH}") add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/lib64") add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/usr/lib64") - add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}") + add_toolchain_linker_flag("-Wl,--rpath-link=${TIZEN_TOOLCHAIN_PATH}") endif() elseif(TARGET_ARCH_NAME STREQUAL "s390x") add_toolchain_linker_flag("--target=${TOOLCHAIN}") @@ -297,10 +292,10 @@ elseif(TARGET_ARCH_NAME STREQUAL "x86") endif() add_toolchain_linker_flag(-m32) if(TIZEN) - add_toolchain_linker_flag("-B${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}") + add_toolchain_linker_flag("-B${TIZEN_TOOLCHAIN_PATH}") add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib") add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib") - add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}") + add_toolchain_linker_flag("-L${TIZEN_TOOLCHAIN_PATH}") endif() elseif(ILLUMOS) add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib/amd64") diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1 index aab40de3fd9..4f0546dce12 100644 --- a/eng/common/sdk-task.ps1 +++ b/eng/common/sdk-task.ps1 @@ -64,7 +64,7 @@ try { $GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty } if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) { - $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.10.0-pre.4.0" -MemberType NoteProperty + $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.12.0" -MemberType NoteProperty } if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") { $xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 22954477a57..a46b6deb759 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -320,7 +320,7 @@ function InstallDotNet([string] $dotnetRoot, $variations += @($installParameters) $dotnetBuilds = $installParameters.Clone() - $dotnetbuilds.AzureFeed = "https://dotnetbuilds.azureedge.net/public" + $dotnetbuilds.AzureFeed = "https://ci.dot.net/public" $variations += @($dotnetBuilds) if ($runtimeSourceFeed) { @@ -383,8 +383,8 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements = # If the version of msbuild is going to be xcopied, # use this version. Version matches a package here: - # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.DotNet.Arcade.MSBuild.Xcopy/versions/17.10.0-pre.4.0 - $defaultXCopyMSBuildVersion = '17.10.0-pre.4.0' + # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.DotNet.Arcade.MSBuild.Xcopy/versions/17.12.0 + $defaultXCopyMSBuildVersion = '17.12.0' if (!$vsRequirements) { if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') { diff --git a/eng/common/tools.sh b/eng/common/tools.sh index 00473c9f918..1159726a10f 100644 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -232,7 +232,7 @@ function InstallDotNet { local public_location=("${installParameters[@]}") variations+=(public_location) - local dotnetbuilds=("${installParameters[@]}" --azure-feed "https://dotnetbuilds.azureedge.net/public") + local dotnetbuilds=("${installParameters[@]}" --azure-feed "https://ci.dot.net/public") variations+=(dotnetbuilds) if [[ -n "${6:-}" ]]; then diff --git a/global.json b/global.json index 30ef1ef74e3..baa1ab80f5a 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "9.0.100-rc.2.24474.11", + "dotnet": "9.0.100", "runtimes": { "aspnetcore": [ "$(MicrosoftAspNetCoreApp60Version)", @@ -31,7 +31,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24562.13", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24562.13" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24623.3", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24623.3" } } From 4cd4305edc5d23f61dd6887b875e01d041acd998 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 8 Jan 2025 08:48:55 -0800 Subject: [PATCH 547/568] Update dependencies from https://github.com/dotnet/diagnostics build 20250107.1 (#7796) Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe , Microsoft.FileFormats From Version 9.0.0-preview.25056.1 -> To Version 9.0.0-preview.25057.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5b9078141ac..785092cab4a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore af22effae4069a5dfb9b0735859de48820104f5b - + https://github.com/dotnet/diagnostics - 22f5efe73633735cfc03246404e83f0797b61422 + 27b41b7fa72eb0200b8a0876f471e22d0ff3194d - + https://github.com/dotnet/diagnostics - 22f5efe73633735cfc03246404e83f0797b61422 + 27b41b7fa72eb0200b8a0876f471e22d0ff3194d https://github.com/dotnet/command-line-api @@ -42,9 +42,9 @@ https://github.com/dotnet/arcade e0e05154656254a735ebf19ffa5a37a8b915039b - + https://github.com/dotnet/diagnostics - 22f5efe73633735cfc03246404e83f0797b61422 + 27b41b7fa72eb0200b8a0876f471e22d0ff3194d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index ead03a6b03e..b8a4ccbc1f9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24528.1 - 9.0.0-preview.25056.1 - 9.0.0-preview.25056.1 + 9.0.0-preview.25057.1 + 9.0.0-preview.25057.1 9.0.0-preview.24629.2 @@ -67,7 +67,7 @@ 9.0.102-servicing.24610.2 - 1.0.605601 + 1.0.605701 $(MicrosoftNETCoreApp31Version) From 759b31c1cb7f5af64d826e11a35a594a4e337a18 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 8 Jan 2025 15:11:47 -0800 Subject: [PATCH 548/568] Remove xcopy-msbuild from global.json (#7800) Co-authored-by: kkeirstead <85592574+kkeirstead@users.noreply.github.com> --- global.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/global.json b/global.json index baa1ab80f5a..7e848733764 100644 --- a/global.json +++ b/global.json @@ -26,8 +26,7 @@ "$(MicrosoftNETCoreApp80Version)", "$(VSRedistCommonNetCoreSharedFrameworkx6490Version)" ] - }, - "xcopy-msbuild": "17.8.5" + } }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", From 5d11e0e9d4e48e145e81397d7d297fafb2a48552 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 11 Jan 2025 07:07:37 +0000 Subject: [PATCH 549/568] Update dependencies from https://github.com/dotnet/arcade build 20250108.5 (#7808) [feature/9.x] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- global.json | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 785092cab4a..348f6bdeb38 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,25 +22,25 @@ https://github.com/dotnet/roslyn-analyzers 5bfaf6aea5cf9d1c924d9adc69916eac3be07880 - + https://github.com/dotnet/arcade - e0e05154656254a735ebf19ffa5a37a8b915039b + 8cc6ecd76c24ef6665579a5c5e386a211a1e7c54 - + https://github.com/dotnet/arcade - e0e05154656254a735ebf19ffa5a37a8b915039b + 8cc6ecd76c24ef6665579a5c5e386a211a1e7c54 - + https://github.com/dotnet/arcade - e0e05154656254a735ebf19ffa5a37a8b915039b + 8cc6ecd76c24ef6665579a5c5e386a211a1e7c54 - + https://github.com/dotnet/arcade - e0e05154656254a735ebf19ffa5a37a8b915039b + 8cc6ecd76c24ef6665579a5c5e386a211a1e7c54 - + https://github.com/dotnet/arcade - e0e05154656254a735ebf19ffa5a37a8b915039b + 8cc6ecd76c24ef6665579a5c5e386a211a1e7c54 https://github.com/dotnet/diagnostics diff --git a/eng/Versions.props b/eng/Versions.props index b8a4ccbc1f9..1829d2b376a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,9 +48,9 @@ --> - 9.0.0-beta.24623.3 - 9.0.0-beta.24623.3 - 9.0.0-beta.24623.3 + 9.0.0-beta.25058.5 + 9.0.0-beta.25058.5 + 9.0.0-beta.25058.5 9.0.0 9.0.0-rtm.24529.3 diff --git a/global.json b/global.json index 7e848733764..470ddaf9c46 100644 --- a/global.json +++ b/global.json @@ -30,7 +30,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24623.3", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24623.3" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25058.5", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25058.5" } } From 8eabdc2738efdfaf28cfe8b0eeac2a9c7ed14746 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 13 Jan 2025 00:09:34 +0000 Subject: [PATCH 550/568] Restore branch-specific files --- .../job/publish-build-assets.yml | 127 +---------- .../post-build/common-variables.yml | 21 +- eng/common/templates/job/job.yml | 201 +----------------- 3 files changed, 6 insertions(+), 343 deletions(-) diff --git a/eng/common/templates-official/job/publish-build-assets.yml b/eng/common/templates-official/job/publish-build-assets.yml index 64113607bfc..d667a70e8de 100644 --- a/eng/common/templates-official/job/publish-build-assets.yml +++ b/eng/common/templates-official/job/publish-build-assets.yml @@ -3,128 +3,5 @@ jobs: parameters: is1ESPipeline: true - dependsOn: ${{ parameters.dependsOn }} - timeoutInMinutes: 150 - - ${{ if eq(parameters.publishAssetsImmediately, 'true') }}: - displayName: Publish Assets - ${{ else }}: - displayName: Publish to Build Asset Registry - - variables: - - template: /eng/common/templates-official/variables/pool-providers.yml - - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - group: Publish-Build-Assets - - group: AzureDevOps-Artifact-Feeds-Pats - - name: runCodesignValidationInjection - value: false - - ${{ if eq(parameters.publishAssetsImmediately, 'true') }}: - - template: /eng/common/templates-official/post-build/common-variables.yml - - pool: - # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) - ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: - name: AzurePipelines-EO - image: 1ESPT-Windows2022 - demands: Cmd - os: windows - # If it's not devdiv, it's dnceng - ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: - name: NetCore1ESPool-Publishing-Internal - image: windows.vs2019.amd64 - os: windows - steps: - - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - task: DownloadBuildArtifacts@0 - displayName: Download artifact - inputs: - artifactName: AssetManifests - downloadPath: '$(Build.StagingDirectory)/Download' - checkDownloadedFiles: true - condition: ${{ parameters.condition }} - continueOnError: ${{ parameters.continueOnError }} - - - task: NuGetAuthenticate@1 - - - task: AzureCLI@2 - displayName: Publish Build Assets - inputs: - azureSubscription: "Darc: Maestro Production" - scriptType: ps - scriptLocation: scriptPath - scriptPath: $(Build.SourcesDirectory)/eng/common/sdk-task.ps1 - arguments: > - -task PublishBuildAssets -restore -msbuildEngine dotnet - /p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests' - /p:MaestroApiEndpoint=https://maestro.dot.net - /p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }} - /p:OfficialBuildId=$(Build.BuildNumber) - condition: ${{ parameters.condition }} - continueOnError: ${{ parameters.continueOnError }} - - - task: powershell@2 - displayName: Create ReleaseConfigs Artifact - inputs: - targetType: inline - script: | - New-Item -Path "$(Build.StagingDirectory)/ReleaseConfigs" -ItemType Directory -Force - $filePath = "$(Build.StagingDirectory)/ReleaseConfigs/ReleaseConfigs.txt" - Add-Content -Path $filePath -Value $(BARBuildId) - Add-Content -Path $filePath -Value "$(DefaultChannels)" - Add-Content -Path $filePath -Value $(IsStableBuild) - - - task: 1ES.PublishBuildArtifacts@1 - displayName: Publish ReleaseConfigs Artifact - inputs: - PathtoPublish: '$(Build.StagingDirectory)/ReleaseConfigs' - PublishLocation: Container - ArtifactName: ReleaseConfigs - - - task: powershell@2 - displayName: Check if SymbolPublishingExclusionsFile.txt exists - inputs: - targetType: inline - script: | - $symbolExclusionfile = "$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt" - if(Test-Path -Path $symbolExclusionfile) - { - Write-Host "SymbolExclusionFile exists" - Write-Host "##vso[task.setvariable variable=SymbolExclusionFile]true" - } - else{ - Write-Host "Symbols Exclusion file does not exists" - Write-Host "##vso[task.setvariable variable=SymbolExclusionFile]false" - } - - - task: 1ES.PublishBuildArtifacts@1 - displayName: Publish SymbolPublishingExclusionsFile Artifact - condition: eq(variables['SymbolExclusionFile'], 'true') - inputs: - PathtoPublish: '$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' - PublishLocation: Container - ArtifactName: ReleaseConfigs - - - ${{ if eq(parameters.publishAssetsImmediately, 'true') }}: - - template: /eng/common/templates-official/post-build/setup-maestro-vars.yml - parameters: - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - - - task: AzureCLI@2 - displayName: Publish Using Darc - inputs: - azureSubscription: "Darc: Maestro Production" - scriptType: ps - scriptLocation: scriptPath - scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 - arguments: -BuildId $(BARBuildId) - -PublishingInfraVersion 3 - -AzdoToken '$(System.AccessToken)' - -WaitPublishingFinish true - -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' - -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' - - - ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}: - - template: /eng/common/templates-official/steps/publish-logs.yml - parameters: - JobLabel: 'Publish_Artifacts_Logs' + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/eng/common/templates-official/post-build/common-variables.yml b/eng/common/templates-official/post-build/common-variables.yml index e277437d2bd..c32fc49233f 100644 --- a/eng/common/templates-official/post-build/common-variables.yml +++ b/eng/common/templates-official/post-build/common-variables.yml @@ -4,22 +4,5 @@ variables: # Specifies whether to use 1ES is1ESPipeline: true - # Whether the build is internal or not - - name: IsInternalBuild - value: ${{ and(ne(variables['System.TeamProject'], 'public'), contains(variables['Build.SourceBranch'], 'internal')) }} - - # Default Maestro++ API Endpoint and API Version - - name: MaestroApiEndPoint - value: "https://maestro.dot.net" - - name: MaestroApiAccessToken - value: $(MaestroAccessToken) - - name: MaestroApiVersion - value: "2020-02-20" - - - name: SourceLinkCLIVersion - value: 3.0.0 - - name: SymbolToolVersion - value: 1.0.1 - - - name: runCodesignValidationInjection - value: false + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} \ No newline at end of file diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index 0c29553c2a8..d1aeb92fcea 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -21,205 +21,8 @@ jobs: - ${{ each step in parameters.steps }}: - ${{ step }} - ${{ if ne(parameters.container, '') }}: - container: ${{ parameters.container }} - - ${{ if ne(parameters.continueOnError, '') }}: - continueOnError: ${{ parameters.continueOnError }} - - ${{ if ne(parameters.dependsOn, '') }}: - dependsOn: ${{ parameters.dependsOn }} - - ${{ if ne(parameters.displayName, '') }}: - displayName: ${{ parameters.displayName }} - - ${{ if ne(parameters.pool, '') }}: - pool: ${{ parameters.pool }} - - ${{ if ne(parameters.strategy, '') }}: - strategy: ${{ parameters.strategy }} - - ${{ if ne(parameters.timeoutInMinutes, '') }}: - timeoutInMinutes: ${{ parameters.timeoutInMinutes }} - - ${{ if ne(parameters.templateContext, '') }}: - templateContext: ${{ parameters.templateContext }} - - variables: - - ${{ if ne(parameters.enableTelemetry, 'false') }}: - - name: DOTNET_CLI_TELEMETRY_PROFILE - value: '$(Build.Repository.Uri)' - - ${{ if eq(parameters.enableRichCodeNavigation, 'true') }}: - - name: EnableRichCodeNavigation - value: 'true' - # Retry signature validation up to three times, waiting 2 seconds between attempts. - # See https://learn.microsoft.com/en-us/nuget/reference/errors-and-warnings/nu3028#retry-untrusted-root-failures - - name: NUGET_EXPERIMENTAL_CHAIN_BUILD_RETRY_POLICY - value: 3,2000 - - ${{ each variable in parameters.variables }}: - # handle name-value variable syntax - # example: - # - name: [key] - # value: [value] - - ${{ if ne(variable.name, '') }}: - - name: ${{ variable.name }} - value: ${{ variable.value }} - - # handle variable groups - - ${{ if ne(variable.group, '') }}: - - group: ${{ variable.group }} - - # handle template variable syntax - # example: - # - template: path/to/template.yml - # parameters: - # [key]: [value] - - ${{ if ne(variable.template, '') }}: - - template: ${{ variable.template }} - ${{ if ne(variable.parameters, '') }}: - parameters: ${{ variable.parameters }} - - # handle key-value variable syntax. - # example: - # - [key]: [value] - - ${{ if and(eq(variable.name, ''), eq(variable.group, ''), eq(variable.template, '')) }}: - - ${{ each pair in variable }}: - - name: ${{ pair.key }} - value: ${{ pair.value }} - - # DotNet-HelixApi-Access provides 'HelixApiAccessToken' for internal builds - - ${{ if and(eq(parameters.enableTelemetry, 'true'), eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - group: DotNet-HelixApi-Access - - ${{ if ne(parameters.workspace, '') }}: - workspace: ${{ parameters.workspace }} - - steps: - - ${{ if ne(parameters.preSteps, '') }}: - - ${{ each preStep in parameters.preSteps }}: - - ${{ preStep }} - - - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - ${{ if eq(parameters.enableMicrobuild, 'true') }}: - - task: MicroBuildSigningPlugin@4 - displayName: Install MicroBuild plugin - inputs: - signType: $(_SignType) - zipSources: false - feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json - env: - TeamName: $(_TeamName) - continueOnError: ${{ parameters.continueOnError }} - 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@1 - - - ${{ if and(ne(parameters.artifacts.download, 'false'), ne(parameters.artifacts.download, '')) }}: - - task: DownloadPipelineArtifact@2 - inputs: - buildType: current - artifactName: ${{ coalesce(parameters.artifacts.download.name, 'Artifacts_$(Agent.OS)_$(_BuildConfig)') }} - targetPath: ${{ coalesce(parameters.artifacts.download.path, 'artifacts') }} - itemPattern: ${{ coalesce(parameters.artifacts.download.pattern, '**') }} - - - ${{ each step in parameters.steps }}: - - ${{ step }} - - - ${{ if eq(parameters.enableRichCodeNavigation, true) }}: - - task: RichCodeNavIndexer@0 - displayName: RichCodeNav Upload - inputs: - languages: ${{ coalesce(parameters.richCodeNavigationLanguage, 'csharp') }} - environment: ${{ coalesce(parameters.richCodeNavigationEnvironment, 'production') }} - richNavLogOutputDirectory: $(Build.SourcesDirectory)/artifacts/bin - uploadRichNavArtifacts: ${{ coalesce(parameters.richCodeNavigationUploadArtifacts, false) }} - continueOnError: true - - - template: /eng/common/templates/steps/component-governance.yml - parameters: - ${{ if eq(parameters.disableComponentGovernance, '') }}: - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.runAsPublic, 'false'), or(startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/dotnet/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/microsoft/'), eq(variables['Build.SourceBranch'], 'refs/heads/main'))) }}: - disableComponentGovernance: false - ${{ else }}: - disableComponentGovernance: true - ${{ else }}: - disableComponentGovernance: ${{ parameters.disableComponentGovernance }} - componentGovernanceIgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }} - - - ${{ if eq(parameters.enableMicrobuild, 'true') }}: - - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - task: MicroBuildCleanup@1 - displayName: Execute Microbuild cleanup tasks - condition: and(always(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT')) - continueOnError: ${{ parameters.continueOnError }} - env: - TeamName: $(_TeamName) - - - ${{ if ne(parameters.artifacts.publish, '') }}: - - ${{ if and(ne(parameters.artifacts.publish.artifacts, 'false'), ne(parameters.artifacts.publish.artifacts, '')) }}: - - task: CopyFiles@2 - displayName: Gather binaries for publish to artifacts - inputs: - SourceFolder: 'artifacts/bin' - Contents: '**' - TargetFolder: '$(Build.ArtifactStagingDirectory)/artifacts/bin' - - task: CopyFiles@2 - displayName: Gather packages for publish to artifacts - inputs: - SourceFolder: 'artifacts/packages' - Contents: '**' - TargetFolder: '$(Build.ArtifactStagingDirectory)/artifacts/packages' - - task: PublishBuildArtifacts@1 - displayName: Publish pipeline artifacts - inputs: - PathtoPublish: '$(Build.ArtifactStagingDirectory)/artifacts' - PublishLocation: Container - ArtifactName: ${{ coalesce(parameters.artifacts.publish.artifacts.name , 'Artifacts_$(Agent.Os)_$(_BuildConfig)') }} - continueOnError: true - condition: always() - - ${{ if and(ne(parameters.artifacts.publish.logs, 'false'), ne(parameters.artifacts.publish.logs, '')) }}: - - publish: artifacts/log - artifact: ${{ coalesce(parameters.artifacts.publish.logs.name, 'Logs_Build_$(Agent.Os)_$(_BuildConfig)') }} - displayName: Publish logs - continueOnError: true - condition: always() - - - ${{ if ne(parameters.enablePublishBuildArtifacts, 'false') }}: - - task: PublishBuildArtifacts@1 - displayName: Publish Logs - inputs: - PathtoPublish: '$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)' - PublishLocation: Container - ArtifactName: ${{ coalesce(parameters.enablePublishBuildArtifacts.artifactName, '$(Agent.Os)_$(Agent.JobName)' ) }} - continueOnError: true - condition: always() - - - ${{ if or(and(eq(parameters.enablePublishTestResults, 'true'), eq(parameters.testResultsFormat, '')), eq(parameters.testResultsFormat, 'xunit')) }}: - - task: PublishTestResults@2 - displayName: Publish XUnit Test Results - inputs: - testResultsFormat: 'xUnit' - testResultsFiles: '*.xml' - searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)' - testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-xunit - mergeTestResults: ${{ parameters.mergeTestResults }} - continueOnError: true - condition: always() - - ${{ if or(and(eq(parameters.enablePublishTestResults, 'true'), eq(parameters.testResultsFormat, '')), eq(parameters.testResultsFormat, 'vstest')) }}: - - task: PublishTestResults@2 - displayName: Publish TRX Test Results - inputs: - testResultsFormat: 'VSTest' - testResultsFiles: '*.trx' - searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)' - testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-trx - mergeTestResults: ${{ parameters.mergeTestResults }} - continueOnError: true - condition: always() - - - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.enableSbom, 'true')) }}: - - template: /eng/common/templates/steps/generate-sbom.yml + componentGovernanceSteps: + - template: /eng/common/templates/steps/component-governance.yml parameters: ${{ if eq(parameters.disableComponentGovernance, '') }}: ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.runAsPublic, 'false'), or(startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/dotnet/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/microsoft/'), eq(variables['Build.SourceBranch'], 'refs/heads/main'))) }}: From 185810c2661c7c3deae78962966ccf16e400a42f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 14 Jan 2025 16:28:04 -0800 Subject: [PATCH 551/568] [feature/9.x] Update dependencies from dotnet/diagnostics (#7802) * Update dependencies from https://github.com/dotnet/diagnostics build 20250108.1 Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe , Microsoft.FileFormats From Version 9.0.0-preview.25057.1 -> To Version 9.0.0-preview.25058.1 * Update dependencies from https://github.com/dotnet/diagnostics build 20250109.1 Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe , Microsoft.FileFormats From Version 9.0.0-preview.25057.1 -> To Version 9.0.0-preview.25059.1 * Update dependencies from https://github.com/dotnet/diagnostics build 20250110.1 Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe , Microsoft.FileFormats From Version 9.0.0-preview.25057.1 -> To Version 9.0.0-preview.25060.1 * Update dependencies from https://github.com/dotnet/diagnostics build 20250112.1 Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe , Microsoft.FileFormats From Version 9.0.0-preview.25057.1 -> To Version 9.0.0-preview.25062.1 * Update dependencies from https://github.com/dotnet/diagnostics build 20250113.1 Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe , Microsoft.FileFormats From Version 9.0.0-preview.25057.1 -> To Version 9.0.0-preview.25063.1 --------- Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 348f6bdeb38..039398d5074 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore af22effae4069a5dfb9b0735859de48820104f5b - + https://github.com/dotnet/diagnostics - 27b41b7fa72eb0200b8a0876f471e22d0ff3194d + 8591a91fde1d730838c1a717298e526890e3d733 - + https://github.com/dotnet/diagnostics - 27b41b7fa72eb0200b8a0876f471e22d0ff3194d + 8591a91fde1d730838c1a717298e526890e3d733 https://github.com/dotnet/command-line-api @@ -42,9 +42,9 @@ https://github.com/dotnet/arcade 8cc6ecd76c24ef6665579a5c5e386a211a1e7c54 - + https://github.com/dotnet/diagnostics - 27b41b7fa72eb0200b8a0876f471e22d0ff3194d + 8591a91fde1d730838c1a717298e526890e3d733 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 1829d2b376a..2651da51162 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24528.1 - 9.0.0-preview.25057.1 - 9.0.0-preview.25057.1 + 9.0.0-preview.25063.1 + 9.0.0-preview.25063.1 9.0.0-preview.24629.2 @@ -67,7 +67,7 @@ 9.0.102-servicing.24610.2 - 1.0.605701 + 1.0.606301 $(MicrosoftNETCoreApp31Version) From f6b4ddc09f66b85c1e6b71bd7888b8bbdef04500 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 15 Jan 2025 18:03:57 +0000 Subject: [PATCH 552/568] [feature/9.x] Bump Microsoft.NETCore.DotNetHost (#7818) Bumps the runtime-dependencies group in /eng/dependabot/net8.0 with 1 update: [Microsoft.NETCore.DotNetHost](https://github.com/dotnet/runtime). Updates `Microsoft.NETCore.DotNetHost` from 8.0.11 to 8.0.12 - [Release notes](https://github.com/dotnet/runtime/releases) - [Commits](https://github.com/dotnet/runtime/compare/v8.0.11...v8.0.12) --- updated-dependencies: - dependency-name: Microsoft.NETCore.DotNetHost dependency-type: direct:production update-type: version-update:semver-patch dependency-group: runtime-dependencies ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- eng/dependabot/net8.0/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/dependabot/net8.0/Versions.props b/eng/dependabot/net8.0/Versions.props index 0da8a9df0a6..1bbb10c5091 100644 --- a/eng/dependabot/net8.0/Versions.props +++ b/eng/dependabot/net8.0/Versions.props @@ -10,7 +10,7 @@ 8.0.1 - 8.0.11 + 8.0.12 8.0.5 From 465eee0a65d36d49fecab279321d1878b991fde6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 15 Jan 2025 18:16:46 +0000 Subject: [PATCH 553/568] [feature/9.x] Bump the azure-sdk-dependencies group (#7819) Bumps the azure-sdk-dependencies group in /eng/dependabot/independent with 2 updates: [Azure.Core](https://github.com/Azure/azure-sdk-for-net) and [Azure.Identity](https://github.com/Azure/azure-sdk-for-net). Updates `Azure.Core` from 1.44.1 to 1.44.1 - [Release notes](https://github.com/Azure/azure-sdk-for-net/releases) - [Commits](https://github.com/Azure/azure-sdk-for-net/compare/Azure.Core_1.44.1...Azure.Core_1.44.1) Updates `Azure.Identity` from 1.13.1 to 1.13.2 - [Release notes](https://github.com/Azure/azure-sdk-for-net/releases) - [Commits](https://github.com/Azure/azure-sdk-for-net/compare/Azure.Identity_1.13.1...Azure.Identity_1.13.2) --- updated-dependencies: - dependency-name: Azure.Core dependency-type: direct:production update-type: version-update:semver-patch dependency-group: azure-sdk-dependencies - dependency-name: Azure.Identity dependency-type: direct:production update-type: version-update:semver-patch dependency-group: azure-sdk-dependencies ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- eng/dependabot/independent/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/dependabot/independent/Versions.props b/eng/dependabot/independent/Versions.props index 8cb8137b2f3..0bb43f882f0 100644 --- a/eng/dependabot/independent/Versions.props +++ b/eng/dependabot/independent/Versions.props @@ -3,7 +3,7 @@ 1.44.1 - 1.13.1 + 1.13.2 12.23.0 12.21.0 3.5.0 From b83d4717fb6d958e0c4add71949fcbca67fac7fd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 15 Jan 2025 10:32:17 -0800 Subject: [PATCH 554/568] Update dependencies from https://github.com/dotnet/diagnostics build 20250114.1 (#7814) Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe , Microsoft.FileFormats From Version 9.0.0-preview.25063.1 -> To Version 9.0.0-preview.25064.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 039398d5074..893f9171bb2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore af22effae4069a5dfb9b0735859de48820104f5b - + https://github.com/dotnet/diagnostics - 8591a91fde1d730838c1a717298e526890e3d733 + 6ab43b9cba184783b40e24a6c7d09d19b7eda490 - + https://github.com/dotnet/diagnostics - 8591a91fde1d730838c1a717298e526890e3d733 + 6ab43b9cba184783b40e24a6c7d09d19b7eda490 https://github.com/dotnet/command-line-api @@ -42,9 +42,9 @@ https://github.com/dotnet/arcade 8cc6ecd76c24ef6665579a5c5e386a211a1e7c54 - + https://github.com/dotnet/diagnostics - 8591a91fde1d730838c1a717298e526890e3d733 + 6ab43b9cba184783b40e24a6c7d09d19b7eda490 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 2651da51162..4b2e3f5c5fc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24528.1 - 9.0.0-preview.25063.1 - 9.0.0-preview.25063.1 + 9.0.0-preview.25064.1 + 9.0.0-preview.25064.1 9.0.0-preview.24629.2 @@ -67,7 +67,7 @@ 9.0.102-servicing.24610.2 - 1.0.606301 + 1.0.606401 $(MicrosoftNETCoreApp31Version) From 38e4a2261bf8f3ca31d95ec0115ad2f97eb97620 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 16 Jan 2025 06:27:40 +0000 Subject: [PATCH 555/568] Update dependencies from https://github.com/dotnet/diagnostics build 20250115.1 (#7824) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 893f9171bb2..f81217a359c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore af22effae4069a5dfb9b0735859de48820104f5b - + https://github.com/dotnet/diagnostics - 6ab43b9cba184783b40e24a6c7d09d19b7eda490 + 41ea0e0666b67b9cd4e8ce49792d3478aaaf4a5c - + https://github.com/dotnet/diagnostics - 6ab43b9cba184783b40e24a6c7d09d19b7eda490 + 41ea0e0666b67b9cd4e8ce49792d3478aaaf4a5c https://github.com/dotnet/command-line-api @@ -42,9 +42,9 @@ https://github.com/dotnet/arcade 8cc6ecd76c24ef6665579a5c5e386a211a1e7c54 - + https://github.com/dotnet/diagnostics - 6ab43b9cba184783b40e24a6c7d09d19b7eda490 + 41ea0e0666b67b9cd4e8ce49792d3478aaaf4a5c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 4b2e3f5c5fc..fd0527b78dc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24528.1 - 9.0.0-preview.25064.1 - 9.0.0-preview.25064.1 + 9.0.0-preview.25065.1 + 9.0.0-preview.25065.1 9.0.0-preview.24629.2 @@ -67,7 +67,7 @@ 9.0.102-servicing.24610.2 - 1.0.606401 + 1.0.606501 $(MicrosoftNETCoreApp31Version) From a606b50c7c1d0b7e899da2c2d07fe2003d4fe873 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 16 Jan 2025 06:38:25 +0000 Subject: [PATCH 556/568] Update dependencies from https://github.com/dotnet/arcade build 20250115.2 (#7825) [feature/9.x] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- eng/common/template-guidance.md | 2 +- global.json | 6 +++--- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f81217a359c..ab95a914fac 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,25 +22,25 @@ https://github.com/dotnet/roslyn-analyzers 5bfaf6aea5cf9d1c924d9adc69916eac3be07880 - + https://github.com/dotnet/arcade - 8cc6ecd76c24ef6665579a5c5e386a211a1e7c54 + c4bbc67763bf0c5a868862df874079380e647d61 - + https://github.com/dotnet/arcade - 8cc6ecd76c24ef6665579a5c5e386a211a1e7c54 + c4bbc67763bf0c5a868862df874079380e647d61 - + https://github.com/dotnet/arcade - 8cc6ecd76c24ef6665579a5c5e386a211a1e7c54 + c4bbc67763bf0c5a868862df874079380e647d61 - + https://github.com/dotnet/arcade - 8cc6ecd76c24ef6665579a5c5e386a211a1e7c54 + c4bbc67763bf0c5a868862df874079380e647d61 - + https://github.com/dotnet/arcade - 8cc6ecd76c24ef6665579a5c5e386a211a1e7c54 + c4bbc67763bf0c5a868862df874079380e647d61 https://github.com/dotnet/diagnostics diff --git a/eng/Versions.props b/eng/Versions.props index fd0527b78dc..9aaa3a5adeb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,9 +48,9 @@ --> - 9.0.0-beta.25058.5 - 9.0.0-beta.25058.5 - 9.0.0-beta.25058.5 + 9.0.0-beta.25065.2 + 9.0.0-beta.25065.2 + 9.0.0-beta.25065.2 9.0.0 9.0.0-rtm.24529.3 diff --git a/eng/common/template-guidance.md b/eng/common/template-guidance.md index 5ef6c30ba92..98bbc1ded0b 100644 --- a/eng/common/template-guidance.md +++ b/eng/common/template-guidance.md @@ -57,7 +57,7 @@ extends: Note: Multiple outputs are ONLY applicable to 1ES PT publishing (only usable when referencing `templates-official`). -# Development notes +## Development notes **Folder / file structure** diff --git a/global.json b/global.json index 470ddaf9c46..a9fca091c49 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "9.0.100", + "dotnet": "9.0.102", "runtimes": { "aspnetcore": [ "$(MicrosoftAspNetCoreApp60Version)", @@ -30,7 +30,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25058.5", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25058.5" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25065.2", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25065.2" } } From d50a4b34b47e5849701a5767de1a96429ffb443a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 20 Jan 2025 00:09:01 +0000 Subject: [PATCH 557/568] Restore branch-specific files --- eng/common/tools.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 9fe185db0ed..a46b6deb759 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -383,7 +383,7 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements = # If the version of msbuild is going to be xcopied, # use this version. Version matches a package here: - # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/RoslynTools.MSBuild/versions/17.12.0 + # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.DotNet.Arcade.MSBuild.Xcopy/versions/17.12.0 $defaultXCopyMSBuildVersion = '17.12.0' if (!$vsRequirements) { From 99a89d482a3ea2b099c9f827979d8861ac456cfa Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 21 Jan 2025 08:39:45 -0800 Subject: [PATCH 558/568] [feature/9.x] Update dependencies from dotnet/diagnostics (#7831) * Update dependencies from https://github.com/dotnet/diagnostics build 20250116.1 Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe , Microsoft.FileFormats From Version 9.0.0-preview.25065.1 -> To Version 9.0.0-preview.25066.1 * Update dependencies from https://github.com/dotnet/diagnostics build 20250120.1 Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe , Microsoft.FileFormats From Version 9.0.0-preview.25065.1 -> To Version 9.0.0-preview.25070.1 --------- Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ab95a914fac..c4099f35a65 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore af22effae4069a5dfb9b0735859de48820104f5b - + https://github.com/dotnet/diagnostics - 41ea0e0666b67b9cd4e8ce49792d3478aaaf4a5c + 727134161c6152336bfc268b77911c697d576e5d - + https://github.com/dotnet/diagnostics - 41ea0e0666b67b9cd4e8ce49792d3478aaaf4a5c + 727134161c6152336bfc268b77911c697d576e5d https://github.com/dotnet/command-line-api @@ -42,9 +42,9 @@ https://github.com/dotnet/arcade c4bbc67763bf0c5a868862df874079380e647d61 - + https://github.com/dotnet/diagnostics - 41ea0e0666b67b9cd4e8ce49792d3478aaaf4a5c + 727134161c6152336bfc268b77911c697d576e5d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 9aaa3a5adeb..7645598e39a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24528.1 - 9.0.0-preview.25065.1 - 9.0.0-preview.25065.1 + 9.0.0-preview.25070.1 + 9.0.0-preview.25070.1 9.0.0-preview.24629.2 @@ -67,7 +67,7 @@ 9.0.102-servicing.24610.2 - 1.0.606501 + 1.0.607001 $(MicrosoftNETCoreApp31Version) From d4abebb4300b1a1847d9aaeb3f63322a25925ff1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 22 Jan 2025 09:10:49 -0800 Subject: [PATCH 559/568] Update dependencies from https://github.com/dotnet/sdk build 20250115.25 (#7827) VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0 From Version 9.0.102-servicing.24610.2 -> To Version 9.0.103-servicing.25065.25 Dependency coherency updates Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0 From Version 9.0.0 -> To Version 9.0.1 (parent: VS.Redist.Common.NetCore.SdkPlaceholder.x64.9.0 Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 24 ++++++++++++++++++++++++ eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 3 files changed, 39 insertions(+), 15 deletions(-) diff --git a/NuGet.config b/NuGet.config index c59695f632b..a3b0d7035e1 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,8 +10,20 @@ + + + + + + + + + + + + @@ -30,8 +42,20 @@ + + + + + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c4099f35a65..327a0c53cb9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - af22effae4069a5dfb9b0735859de48820104f5b + 4442a188f9200a57635373dcd640893c0e8dcc78 https://github.com/dotnet/diagnostics @@ -46,21 +46,21 @@ https://github.com/dotnet/diagnostics 727134161c6152336bfc268b77911c697d576e5d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 + c8acea22626efab11c13778c028975acdc34678f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - af22effae4069a5dfb9b0735859de48820104f5b + 4442a188f9200a57635373dcd640893c0e8dcc78 - + https://github.com/dotnet/sdk - a345a00343aa14a693aec75a3d56fc07e99e517f + 049799c39d766c58ef6388865d5f5ed273b6a75e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 + c8acea22626efab11c13778c028975acdc34678f diff --git a/eng/Versions.props b/eng/Versions.props index 7645598e39a..9d997436595 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,8 +52,8 @@ 9.0.0-beta.25065.2 9.0.0-beta.25065.2 - 9.0.0 - 9.0.0-rtm.24529.3 + 9.0.1 + 9.0.1-rtm.24610.9 2.0.0-beta4.24528.1 @@ -62,10 +62,10 @@ 9.0.0-preview.24629.2 - 9.0.0 - 9.0.0-rtm.24528.9 + 9.0.1 + 9.0.1-servicing.24610.10 - 9.0.102-servicing.24610.2 + 9.0.103-servicing.25065.25 1.0.607001 From fbc0240ab527e4aef94c6f600f89625944cc1c05 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 22 Jan 2025 09:12:10 -0800 Subject: [PATCH 560/568] Update dependencies from https://github.com/dotnet/diagnostics build 20250121.1 (#7843) Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe , Microsoft.FileFormats From Version 9.0.0-preview.25070.1 -> To Version 9.0.0-preview.25071.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 327a0c53cb9..69affa6b9dc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 4442a188f9200a57635373dcd640893c0e8dcc78 - + https://github.com/dotnet/diagnostics - 727134161c6152336bfc268b77911c697d576e5d + 9ec1e8573b7379918fca745c60eb33039cfc7a13 - + https://github.com/dotnet/diagnostics - 727134161c6152336bfc268b77911c697d576e5d + 9ec1e8573b7379918fca745c60eb33039cfc7a13 https://github.com/dotnet/command-line-api @@ -42,9 +42,9 @@ https://github.com/dotnet/arcade c4bbc67763bf0c5a868862df874079380e647d61 - + https://github.com/dotnet/diagnostics - 727134161c6152336bfc268b77911c697d576e5d + 9ec1e8573b7379918fca745c60eb33039cfc7a13 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 9d997436595..0fd3c8720f2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.24528.1 - 9.0.0-preview.25070.1 - 9.0.0-preview.25070.1 + 9.0.0-preview.25071.1 + 9.0.0-preview.25071.1 9.0.0-preview.24629.2 @@ -67,7 +67,7 @@ 9.0.103-servicing.25065.25 - 1.0.607001 + 1.0.607101 $(MicrosoftNETCoreApp31Version) From 36661a1fbed0f162c651741a054d70f218922efc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 22 Jan 2025 09:12:34 -0800 Subject: [PATCH 561/568] Update dependencies from https://github.com/dotnet/command-line-api build 20250121.2 (#7844) System.CommandLine From Version 2.0.0-beta4.24528.1 -> To Version 2.0.0-beta4.25071.2 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 69affa6b9dc..b5638133494 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -12,9 +12,9 @@ https://github.com/dotnet/diagnostics 9ec1e8573b7379918fca745c60eb33039cfc7a13 - + https://github.com/dotnet/command-line-api - feb61c7f328a2401d74f4317b39d02126cfdfe24 + 3bbb940ceeb3254790899d751a8d418348563d40 diff --git a/eng/Versions.props b/eng/Versions.props index 0fd3c8720f2..0c989bfa6a0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,7 +55,7 @@ 9.0.1 9.0.1-rtm.24610.9 - 2.0.0-beta4.24528.1 + 2.0.0-beta4.25071.2 9.0.0-preview.25071.1 9.0.0-preview.25071.1 From b5e2a6fc8bc83eb3a9629fe6c519823f2c8cb175 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 23 Jan 2025 18:34:12 +0000 Subject: [PATCH 562/568] [feature/9.x] Update dependencies from dotnet/command-line-api (#7851) [feature/9.x] Update dependencies from dotnet/command-line-api - Adjustments due to renamed types in System.CommandLine --- eng/Version.Details.xml | 4 +- eng/Versions.props | 2 +- src/Extensions/AzureBlobStorage/Program.cs | 4 +- src/Extensions/S3Storage/Program.cs | 4 +- .../EgressHelper.cs | 8 +-- .../Program.cs | 6 +- .../Program.cs | 2 +- .../Scenarios/ExceptionThrowCatchScenario.cs | 4 +- .../Scenarios/ExceptionThrowCrashScenario.cs | 4 +- .../Program.cs | 2 +- .../Scenarios/AspNetScenario.cs | 4 +- .../Scenarios/AsyncWaitScenario.cs | 4 +- .../Scenarios/EnvironmentVariablesScenario.cs | 4 +- .../Scenarios/ExceptionsScenario.cs | 38 +++++------ .../Scenarios/ExecuteScenario.cs | 18 ++--- .../FunctionProbes/FunctionProbesScenario.cs | 10 +-- .../Scenarios/LoggerScenario.cs | 4 +- .../Scenarios/MetricsScenario.cs | 4 +- .../Scenarios/ParameterCapturingScenario.cs | 8 +-- .../Scenarios/SpinWaitScenario.cs | 4 +- .../Scenarios/StacksScenario.cs | 4 +- .../Scenarios/TraceEventsScenario.cs | 4 +- src/Tools/dotnet-monitor/Program.cs | 68 +++++++++---------- 23 files changed, 107 insertions(+), 107 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b5638133494..b508824cf9c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -12,9 +12,9 @@ https://github.com/dotnet/diagnostics 9ec1e8573b7379918fca745c60eb33039cfc7a13 - + https://github.com/dotnet/command-line-api - 3bbb940ceeb3254790899d751a8d418348563d40 + 060374e56c1b2e741b6525ca8417006efb54fbd7 diff --git a/eng/Versions.props b/eng/Versions.props index 0c989bfa6a0..54d5b0cb0ab 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,7 +55,7 @@ 9.0.1 9.0.1-rtm.24610.9 - 2.0.0-beta4.25071.2 + 2.0.0-beta4.25072.1 9.0.0-preview.25071.1 9.0.0-preview.25071.1 diff --git a/src/Extensions/AzureBlobStorage/Program.cs b/src/Extensions/AzureBlobStorage/Program.cs index 9d8e1f1da1f..e619f244a0d 100644 --- a/src/Extensions/AzureBlobStorage/Program.cs +++ b/src/Extensions/AzureBlobStorage/Program.cs @@ -13,9 +13,9 @@ internal sealed class Program static async Task Main(string[] args) { // Expected command line format is: dotnet-monitor-egress-azureblobstorage.exe Egress - CliRootCommand rootCommand = new CliRootCommand("Egresses an artifact to Azure storage."); + RootCommand rootCommand = new RootCommand("Egresses an artifact to Azure storage."); - CliCommand egressCmd = EgressHelper.CreateEgressCommand(ConfigureServices); + Command egressCmd = EgressHelper.CreateEgressCommand(ConfigureServices); rootCommand.Add(egressCmd); diff --git a/src/Extensions/S3Storage/Program.cs b/src/Extensions/S3Storage/Program.cs index 68c40696736..f69999a4951 100644 --- a/src/Extensions/S3Storage/Program.cs +++ b/src/Extensions/S3Storage/Program.cs @@ -12,10 +12,10 @@ internal sealed class Program static async Task Main(string[] args) { // Expected command line format is: dotnet-monitor-egress-s3storage.exe Egress - CliRootCommand rootCommand = new CliRootCommand("Egresses an artifact to S3 storage."); + RootCommand rootCommand = new RootCommand("Egresses an artifact to S3 storage."); // TODO: Not currently doing any extra configuration/validation for S3 here - CliCommand egressCmd = EgressHelper.CreateEgressCommand(); + Command egressCmd = EgressHelper.CreateEgressCommand(); rootCommand.Add(egressCmd); diff --git a/src/Microsoft.Diagnostics.Monitoring.Extension.Common/EgressHelper.cs b/src/Microsoft.Diagnostics.Monitoring.Extension.Common/EgressHelper.cs index 5f89be65af3..1c60b72c851 100644 --- a/src/Microsoft.Diagnostics.Monitoring.Extension.Common/EgressHelper.cs +++ b/src/Microsoft.Diagnostics.Monitoring.Extension.Common/EgressHelper.cs @@ -25,17 +25,17 @@ public sealed class EgressHelper private static CancellationTokenSource CancelSource = new CancellationTokenSource(); private const int ExpectedPayloadProtocolVersion = 1; - public static CliCommand CreateEgressCommand(Action configureServices = null) + public static Command CreateEgressCommand(Action configureServices = null) where TProvider : EgressProvider where TOptions : class, new() { - CliCommand executeCommand = new CliCommand("Execute", "Execute is for egressing an artifact."); + Command executeCommand = new Command("Execute", "Execute is for egressing an artifact."); executeCommand.SetAction((result, token) => Egress(configureServices, token)); - CliCommand validateCommand = new CliCommand("Validate", "Validate is for validating an extension's options on configuration change."); + Command validateCommand = new Command("Validate", "Validate is for validating an extension's options on configuration change."); validateCommand.SetAction((result, token) => Validate(configureServices, token)); - CliCommand egressCommand = new CliCommand("Egress", "The class of extension being invoked.") + Command egressCommand = new Command("Egress", "The class of extension being invoked.") { executeCommand, validateCommand diff --git a/src/Tests/Microsoft.Diagnostics.Monitoring.EgressExtensibilityApp/Program.cs b/src/Tests/Microsoft.Diagnostics.Monitoring.EgressExtensibilityApp/Program.cs index 4593381e9c8..6a70d9b0b25 100644 --- a/src/Tests/Microsoft.Diagnostics.Monitoring.EgressExtensibilityApp/Program.cs +++ b/src/Tests/Microsoft.Diagnostics.Monitoring.EgressExtensibilityApp/Program.cs @@ -17,12 +17,12 @@ internal sealed class Program { static int Main(string[] args) { - CliRootCommand rootCommand = new CliRootCommand(); + RootCommand rootCommand = new RootCommand(); - CliCommand executeCommand = new CliCommand("Execute", "Execute is for egressing an artifact."); + Command executeCommand = new Command("Execute", "Execute is for egressing an artifact."); executeCommand.SetAction((result, token) => Egress(token)); - CliCommand egressCommand = new CliCommand("Egress", "The class of extension being invoked.") + Command egressCommand = new Command("Egress", "The class of extension being invoked.") { executeCommand }; diff --git a/src/Tests/Microsoft.Diagnostics.Monitoring.Profiler.UnitTestApp/Program.cs b/src/Tests/Microsoft.Diagnostics.Monitoring.Profiler.UnitTestApp/Program.cs index a6216ad6a52..08cbc00502f 100644 --- a/src/Tests/Microsoft.Diagnostics.Monitoring.Profiler.UnitTestApp/Program.cs +++ b/src/Tests/Microsoft.Diagnostics.Monitoring.Profiler.UnitTestApp/Program.cs @@ -11,7 +11,7 @@ internal static class Program { public static Task Main(string[] args) { - CliRootCommand root = new() + RootCommand root = new() { ExceptionThrowCatchScenario.Command(), ExceptionThrowCrashScenario.Command() diff --git a/src/Tests/Microsoft.Diagnostics.Monitoring.Profiler.UnitTestApp/Scenarios/ExceptionThrowCatchScenario.cs b/src/Tests/Microsoft.Diagnostics.Monitoring.Profiler.UnitTestApp/Scenarios/ExceptionThrowCatchScenario.cs index f31eccdaabf..580beac48d6 100644 --- a/src/Tests/Microsoft.Diagnostics.Monitoring.Profiler.UnitTestApp/Scenarios/ExceptionThrowCatchScenario.cs +++ b/src/Tests/Microsoft.Diagnostics.Monitoring.Profiler.UnitTestApp/Scenarios/ExceptionThrowCatchScenario.cs @@ -11,9 +11,9 @@ namespace Microsoft.Diagnostics.Monitoring.Profiler.UnitTestApp.Scenarios /// internal static class ExceptionThrowCatchScenario { - public static CliCommand Command() + public static Command Command() { - CliCommand command = new("ExceptionThrowCatch"); + Command command = new("ExceptionThrowCatch"); command.SetAction(Execute); return command; } diff --git a/src/Tests/Microsoft.Diagnostics.Monitoring.Profiler.UnitTestApp/Scenarios/ExceptionThrowCrashScenario.cs b/src/Tests/Microsoft.Diagnostics.Monitoring.Profiler.UnitTestApp/Scenarios/ExceptionThrowCrashScenario.cs index cc262ca1ba2..0bcb8a25da7 100644 --- a/src/Tests/Microsoft.Diagnostics.Monitoring.Profiler.UnitTestApp/Scenarios/ExceptionThrowCrashScenario.cs +++ b/src/Tests/Microsoft.Diagnostics.Monitoring.Profiler.UnitTestApp/Scenarios/ExceptionThrowCrashScenario.cs @@ -11,9 +11,9 @@ namespace Microsoft.Diagnostics.Monitoring.Profiler.UnitTestApp.Scenarios /// internal static class ExceptionThrowCrashScenario { - public static CliCommand Command() + public static Command Command() { - CliCommand command = new("ExceptionThrowCrash"); + Command command = new("ExceptionThrowCrash"); command.SetAction(Execute); return command; } diff --git a/src/Tests/Microsoft.Diagnostics.Monitoring.UnitTestApp/Program.cs b/src/Tests/Microsoft.Diagnostics.Monitoring.UnitTestApp/Program.cs index f5cfd0d8d36..22b6649ab6f 100644 --- a/src/Tests/Microsoft.Diagnostics.Monitoring.UnitTestApp/Program.cs +++ b/src/Tests/Microsoft.Diagnostics.Monitoring.UnitTestApp/Program.cs @@ -12,7 +12,7 @@ internal sealed class Program { public static Task Main(string[] args) { - CliRootCommand root = new() + RootCommand root = new() { MetricsScenario.Command(), AspNetScenario.Command(), diff --git a/src/Tests/Microsoft.Diagnostics.Monitoring.UnitTestApp/Scenarios/AspNetScenario.cs b/src/Tests/Microsoft.Diagnostics.Monitoring.UnitTestApp/Scenarios/AspNetScenario.cs index 8eb994dd5ed..1c498553068 100644 --- a/src/Tests/Microsoft.Diagnostics.Monitoring.UnitTestApp/Scenarios/AspNetScenario.cs +++ b/src/Tests/Microsoft.Diagnostics.Monitoring.UnitTestApp/Scenarios/AspNetScenario.cs @@ -15,9 +15,9 @@ namespace Microsoft.Diagnostics.Monitoring.UnitTestApp.Scenarios { internal sealed class AspNetScenario { - public static CliCommand Command() + public static Command Command() { - CliCommand command = new(TestAppScenarios.AspNet.Name); + Command command = new(TestAppScenarios.AspNet.Name); command.SetAction(ExecuteAsync); return command; } diff --git a/src/Tests/Microsoft.Diagnostics.Monitoring.UnitTestApp/Scenarios/AsyncWaitScenario.cs b/src/Tests/Microsoft.Diagnostics.Monitoring.UnitTestApp/Scenarios/AsyncWaitScenario.cs index c28027bff54..edce47e5920 100644 --- a/src/Tests/Microsoft.Diagnostics.Monitoring.UnitTestApp/Scenarios/AsyncWaitScenario.cs +++ b/src/Tests/Microsoft.Diagnostics.Monitoring.UnitTestApp/Scenarios/AsyncWaitScenario.cs @@ -13,9 +13,9 @@ namespace Microsoft.Diagnostics.Monitoring.UnitTestApp.Scenarios /// internal static class AsyncWaitScenario { - public static CliCommand Command() + public static Command Command() { - CliCommand command = new(TestAppScenarios.AsyncWait.Name); + Command command = new(TestAppScenarios.AsyncWait.Name); command.SetAction(ExecuteAsync); return command; } diff --git a/src/Tests/Microsoft.Diagnostics.Monitoring.UnitTestApp/Scenarios/EnvironmentVariablesScenario.cs b/src/Tests/Microsoft.Diagnostics.Monitoring.UnitTestApp/Scenarios/EnvironmentVariablesScenario.cs index 542e720bf52..204ff59533f 100644 --- a/src/Tests/Microsoft.Diagnostics.Monitoring.UnitTestApp/Scenarios/EnvironmentVariablesScenario.cs +++ b/src/Tests/Microsoft.Diagnostics.Monitoring.UnitTestApp/Scenarios/EnvironmentVariablesScenario.cs @@ -14,9 +14,9 @@ namespace Microsoft.Diagnostics.Monitoring.UnitTestApp.Scenarios /// internal static class EnvironmentVariablesScenario { - public static CliCommand Command() + public static Command Command() { - CliCommand command = new(TestAppScenarios.EnvironmentVariables.Name); + Command command = new(TestAppScenarios.EnvironmentVariables.Name); command.SetAction(ExecuteAsync); return command; } diff --git a/src/Tests/Microsoft.Diagnostics.Monitoring.UnitTestApp/Scenarios/ExceptionsScenario.cs b/src/Tests/Microsoft.Diagnostics.Monitoring.UnitTestApp/Scenarios/ExceptionsScenario.cs index 131d14d8d95..5d2a9c1aa0f 100644 --- a/src/Tests/Microsoft.Diagnostics.Monitoring.UnitTestApp/Scenarios/ExceptionsScenario.cs +++ b/src/Tests/Microsoft.Diagnostics.Monitoring.UnitTestApp/Scenarios/ExceptionsScenario.cs @@ -15,60 +15,60 @@ namespace Microsoft.Diagnostics.Monitoring.UnitTestApp.Scenarios { internal static class ExceptionsScenario { - public static CliCommand Command() + public static Command Command() { - CliCommand singleExceptionCommand = new(TestAppScenarios.Exceptions.SubScenarios.SingleException); + Command singleExceptionCommand = new(TestAppScenarios.Exceptions.SubScenarios.SingleException); singleExceptionCommand.SetAction(SingleExceptionAsync); - CliCommand multipleExceptionsCommand = new(TestAppScenarios.Exceptions.SubScenarios.MultipleExceptions); + Command multipleExceptionsCommand = new(TestAppScenarios.Exceptions.SubScenarios.MultipleExceptions); multipleExceptionsCommand.SetAction(MultipleExceptionsAsync); - CliCommand repeatExceptionCommand = new(TestAppScenarios.Exceptions.SubScenarios.RepeatException); + Command repeatExceptionCommand = new(TestAppScenarios.Exceptions.SubScenarios.RepeatException); repeatExceptionCommand.SetAction(RepeatExceptionAsync); - CliCommand asyncExceptionCommand = new(TestAppScenarios.Exceptions.SubScenarios.AsyncException); + Command asyncExceptionCommand = new(TestAppScenarios.Exceptions.SubScenarios.AsyncException); asyncExceptionCommand.SetAction(AsyncExceptionAsync); - CliCommand frameworkExceptionCommand = new(TestAppScenarios.Exceptions.SubScenarios.FrameworkException); + Command frameworkExceptionCommand = new(TestAppScenarios.Exceptions.SubScenarios.FrameworkException); frameworkExceptionCommand.SetAction(FrameworkExceptionAsync); - CliCommand customExceptionCommand = new(TestAppScenarios.Exceptions.SubScenarios.CustomException); + Command customExceptionCommand = new(TestAppScenarios.Exceptions.SubScenarios.CustomException); customExceptionCommand.SetAction(CustomExceptionAsync); - CliCommand esotericStackFrameTypesCommand = new(TestAppScenarios.Exceptions.SubScenarios.EsotericStackFrameTypes); + Command esotericStackFrameTypesCommand = new(TestAppScenarios.Exceptions.SubScenarios.EsotericStackFrameTypes); esotericStackFrameTypesCommand.SetAction(EsotericStackFrameTypesAsync); - CliCommand reversePInvokeExceptionCommand = new(TestAppScenarios.Exceptions.SubScenarios.ReversePInvokeException); + Command reversePInvokeExceptionCommand = new(TestAppScenarios.Exceptions.SubScenarios.ReversePInvokeException); reversePInvokeExceptionCommand.SetAction(ReversePInvokeExceptionAsync); - CliCommand dynamicMethodExceptionCommand = new(TestAppScenarios.Exceptions.SubScenarios.DynamicMethodException); + Command dynamicMethodExceptionCommand = new(TestAppScenarios.Exceptions.SubScenarios.DynamicMethodException); dynamicMethodExceptionCommand.SetAction(DynamicMethodExceptionAsync); - CliCommand arrayExceptionCommand = new(TestAppScenarios.Exceptions.SubScenarios.ArrayException); + Command arrayExceptionCommand = new(TestAppScenarios.Exceptions.SubScenarios.ArrayException); arrayExceptionCommand.SetAction(ArrayExceptionAsync); - CliCommand innerUnthrownExceptionCommand = new(TestAppScenarios.Exceptions.SubScenarios.InnerUnthrownException); + Command innerUnthrownExceptionCommand = new(TestAppScenarios.Exceptions.SubScenarios.InnerUnthrownException); innerUnthrownExceptionCommand.SetAction(InnerUnthrownExceptionAsync); - CliCommand innerThrownExceptionCommand = new(TestAppScenarios.Exceptions.SubScenarios.InnerThrownException); + Command innerThrownExceptionCommand = new(TestAppScenarios.Exceptions.SubScenarios.InnerThrownException); innerThrownExceptionCommand.SetAction(InnerThrownExceptionAsync); - CliCommand eclipsingExceptionCommand = new(TestAppScenarios.Exceptions.SubScenarios.EclipsingException); + Command eclipsingExceptionCommand = new(TestAppScenarios.Exceptions.SubScenarios.EclipsingException); eclipsingExceptionCommand.SetAction(EclipsingExceptionAsync); - CliCommand eclipsingExceptionFromMethodCallCommand = new(TestAppScenarios.Exceptions.SubScenarios.EclipsingExceptionFromMethodCall); + Command eclipsingExceptionFromMethodCallCommand = new(TestAppScenarios.Exceptions.SubScenarios.EclipsingExceptionFromMethodCall); eclipsingExceptionFromMethodCallCommand.SetAction(EclipsingExceptionFromMethodCallAsync); - CliCommand aggregateExceptionCommand = new(TestAppScenarios.Exceptions.SubScenarios.AggregateException); + Command aggregateExceptionCommand = new(TestAppScenarios.Exceptions.SubScenarios.AggregateException); aggregateExceptionCommand.SetAction(AggregateExceptionAsync); - CliCommand reflectionTypeLoadExceptionCommand = new(TestAppScenarios.Exceptions.SubScenarios.ReflectionTypeLoadException); + Command reflectionTypeLoadExceptionCommand = new(TestAppScenarios.Exceptions.SubScenarios.ReflectionTypeLoadException); reflectionTypeLoadExceptionCommand.SetAction(ReflectionTypeLoadExceptionAsync); - CliCommand hiddenFramesExceptionCommand = new(TestAppScenarios.Exceptions.SubScenarios.HiddenFramesExceptionCommand); + Command hiddenFramesExceptionCommand = new(TestAppScenarios.Exceptions.SubScenarios.HiddenFramesExceptionCommand); hiddenFramesExceptionCommand.SetAction(HiddenFramesExceptionAsync); - CliCommand scenarioCommand = new(TestAppScenarios.Exceptions.Name); + Command scenarioCommand = new(TestAppScenarios.Exceptions.Name); scenarioCommand.Subcommands.Add(singleExceptionCommand); scenarioCommand.Subcommands.Add(multipleExceptionsCommand); scenarioCommand.Subcommands.Add(repeatExceptionCommand); diff --git a/src/Tests/Microsoft.Diagnostics.Monitoring.UnitTestApp/Scenarios/ExecuteScenario.cs b/src/Tests/Microsoft.Diagnostics.Monitoring.UnitTestApp/Scenarios/ExecuteScenario.cs index cdcfd422dd1..411bfe6e257 100644 --- a/src/Tests/Microsoft.Diagnostics.Monitoring.UnitTestApp/Scenarios/ExecuteScenario.cs +++ b/src/Tests/Microsoft.Diagnostics.Monitoring.UnitTestApp/Scenarios/ExecuteScenario.cs @@ -11,30 +11,30 @@ namespace Microsoft.Diagnostics.Monitoring.UnitTestApp.Scenarios { internal static class ExecuteScenario { - private static readonly CliArgument ContentArgument = new CliArgument("content"); + private static readonly Argument ContentArgument = new Argument("content"); - private static readonly CliArgument DelayArgument = new CliArgument("delay"); + private static readonly Argument DelayArgument = new Argument("delay"); - private static readonly CliArgument PathArgument = new CliArgument("path"); + private static readonly Argument PathArgument = new Argument("path"); - public static CliCommand Command() + public static Command Command() { - CliCommand nonZeroExitCodeCommand = new CliCommand(ActionTestsConstants.NonZeroExitCode); + Command nonZeroExitCodeCommand = new Command(ActionTestsConstants.NonZeroExitCode); nonZeroExitCodeCommand.SetAction(Execute_NonZeroExitCode); - CliCommand sleepCommand = new CliCommand(ActionTestsConstants.Sleep); + Command sleepCommand = new Command(ActionTestsConstants.Sleep); sleepCommand.Arguments.Add(DelayArgument); sleepCommand.SetAction(Execute_Sleep); - CliCommand textFileOutputCommand = new CliCommand(ActionTestsConstants.TextFileOutput); + Command textFileOutputCommand = new Command(ActionTestsConstants.TextFileOutput); textFileOutputCommand.Arguments.Add(PathArgument); textFileOutputCommand.Arguments.Add(ContentArgument); textFileOutputCommand.SetAction(Execute_TextFileOutput); - CliCommand zeroExitCodeCommand = new CliCommand(ActionTestsConstants.ZeroExitCode); + Command zeroExitCodeCommand = new Command(ActionTestsConstants.ZeroExitCode); zeroExitCodeCommand.SetAction(Execute_ZeroExitCode); - CliCommand command = new(TestAppScenarios.Execute.Name); + Command command = new(TestAppScenarios.Execute.Name); command.Subcommands.Add(nonZeroExitCodeCommand); command.Subcommands.Add(sleepCommand); command.Subcommands.Add(textFileOutputCommand); diff --git a/src/Tests/Microsoft.Diagnostics.Monitoring.UnitTestApp/Scenarios/FunctionProbes/FunctionProbesScenario.cs b/src/Tests/Microsoft.Diagnostics.Monitoring.UnitTestApp/Scenarios/FunctionProbes/FunctionProbesScenario.cs index f4962615ad5..eaf5dfe9e0f 100644 --- a/src/Tests/Microsoft.Diagnostics.Monitoring.UnitTestApp/Scenarios/FunctionProbes/FunctionProbesScenario.cs +++ b/src/Tests/Microsoft.Diagnostics.Monitoring.UnitTestApp/Scenarios/FunctionProbes/FunctionProbesScenario.cs @@ -23,9 +23,9 @@ internal static class FunctionProbesScenario { private delegate Task TestCaseAsync(FunctionProbesManager probeManager, PerFunctionProbeProxy probeProxy, CancellationToken token); - public static CliCommand Command() + public static Command Command() { - CliCommand scenarioCommand = new(TestAppScenarios.FunctionProbes.Name); + Command scenarioCommand = new(TestAppScenarios.FunctionProbes.Name); #if NET7_0_OR_GREATER Dictionary testCases = new() @@ -59,7 +59,7 @@ public static CliCommand Command() { TestAppScenarios.FunctionProbes.SubScenarios.RequestInstallationOnProbeFunction, Test_RequestInstallationOnProbeFunctionAsync}, /* Monitor context */ - { TestAppScenarios.FunctionProbes.SubScenarios.ProbeInMonitorContext, Test_DontProbeInMonitorContextAsync}, + { TestAppScenarios.FunctionProbes.SubScenarios.ProbeInMonitorContext, Test_DontProbeInMonitorContextAsync}, /* Self tests */ { TestAppScenarios.FunctionProbes.SubScenarios.AssertsInProbesAreCaught, Test_AssertsInProbesAreCaughtAsync}, @@ -67,7 +67,7 @@ public static CliCommand Command() foreach ((string subCommand, TestCaseAsync testCase) in testCases) { - CliCommand testCaseCommand = new(subCommand); + Command testCaseCommand = new(subCommand); testCaseCommand.SetAction((result, token) => { return ScenarioHelpers.RunScenarioAsync(async _ => @@ -84,7 +84,7 @@ public static CliCommand Command() scenarioCommand.Subcommands.Add(testCaseCommand); } #else // NET7_0_OR_GREATER - CliCommand validateNoMutatingProfilerCommand = new(TestAppScenarios.FunctionProbes.SubScenarios.ValidateNoMutatingProfiler); + Command validateNoMutatingProfilerCommand = new(TestAppScenarios.FunctionProbes.SubScenarios.ValidateNoMutatingProfiler); validateNoMutatingProfilerCommand.SetAction(ValidateNoMutatingProfilerAsync); scenarioCommand.Subcommands.Add(validateNoMutatingProfilerCommand); #endif // NET7_0_OR_GREATER diff --git a/src/Tests/Microsoft.Diagnostics.Monitoring.UnitTestApp/Scenarios/LoggerScenario.cs b/src/Tests/Microsoft.Diagnostics.Monitoring.UnitTestApp/Scenarios/LoggerScenario.cs index 5a10ae25770..a10b63a51dd 100644 --- a/src/Tests/Microsoft.Diagnostics.Monitoring.UnitTestApp/Scenarios/LoggerScenario.cs +++ b/src/Tests/Microsoft.Diagnostics.Monitoring.UnitTestApp/Scenarios/LoggerScenario.cs @@ -16,9 +16,9 @@ namespace Microsoft.Diagnostics.Monitoring.UnitTestApp.Scenarios { internal static class LoggerScenario { - public static CliCommand Command() + public static Command Command() { - CliCommand command = new(TestAppScenarios.Logger.Name); + Command command = new(TestAppScenarios.Logger.Name); command.SetAction(ExecuteAsync); return command; } diff --git a/src/Tests/Microsoft.Diagnostics.Monitoring.UnitTestApp/Scenarios/MetricsScenario.cs b/src/Tests/Microsoft.Diagnostics.Monitoring.UnitTestApp/Scenarios/MetricsScenario.cs index fc5114c75ad..58fdd5c6893 100644 --- a/src/Tests/Microsoft.Diagnostics.Monitoring.UnitTestApp/Scenarios/MetricsScenario.cs +++ b/src/Tests/Microsoft.Diagnostics.Monitoring.UnitTestApp/Scenarios/MetricsScenario.cs @@ -15,9 +15,9 @@ namespace Microsoft.Diagnostics.Monitoring.UnitTestApp.Scenarios { internal static class MetricsScenario { - public static CliCommand Command() + public static Command Command() { - CliCommand command = new(TestAppScenarios.Metrics.Name); + Command command = new(TestAppScenarios.Metrics.Name); command.SetAction(ExecuteAsync); return command; } diff --git a/src/Tests/Microsoft.Diagnostics.Monitoring.UnitTestApp/Scenarios/ParameterCapturingScenario.cs b/src/Tests/Microsoft.Diagnostics.Monitoring.UnitTestApp/Scenarios/ParameterCapturingScenario.cs index ae9a0973382..e9bada9a85d 100644 --- a/src/Tests/Microsoft.Diagnostics.Monitoring.UnitTestApp/Scenarios/ParameterCapturingScenario.cs +++ b/src/Tests/Microsoft.Diagnostics.Monitoring.UnitTestApp/Scenarios/ParameterCapturingScenario.cs @@ -14,15 +14,15 @@ namespace Microsoft.Diagnostics.Monitoring.UnitTestApp.Scenarios { internal sealed class ParameterCapturingScenario { - public static CliCommand Command() + public static Command Command() { - CliCommand aspNetAppCommand = new(TestAppScenarios.ParameterCapturing.SubScenarios.AspNetApp); + Command aspNetAppCommand = new(TestAppScenarios.ParameterCapturing.SubScenarios.AspNetApp); aspNetAppCommand.SetAction(AspNetAppAsync); - CliCommand nonAspNetAppCommand = new(TestAppScenarios.ParameterCapturing.SubScenarios.NonAspNetApp); + Command nonAspNetAppCommand = new(TestAppScenarios.ParameterCapturing.SubScenarios.NonAspNetApp); nonAspNetAppCommand.SetAction(NonAspNetAppAsync); - CliCommand scenarioCommand = new(TestAppScenarios.ParameterCapturing.Name); + Command scenarioCommand = new(TestAppScenarios.ParameterCapturing.Name); scenarioCommand.Subcommands.Add(aspNetAppCommand); scenarioCommand.Subcommands.Add(nonAspNetAppCommand); diff --git a/src/Tests/Microsoft.Diagnostics.Monitoring.UnitTestApp/Scenarios/SpinWaitScenario.cs b/src/Tests/Microsoft.Diagnostics.Monitoring.UnitTestApp/Scenarios/SpinWaitScenario.cs index 28a51fadffa..91421667e41 100644 --- a/src/Tests/Microsoft.Diagnostics.Monitoring.UnitTestApp/Scenarios/SpinWaitScenario.cs +++ b/src/Tests/Microsoft.Diagnostics.Monitoring.UnitTestApp/Scenarios/SpinWaitScenario.cs @@ -13,9 +13,9 @@ namespace Microsoft.Diagnostics.Monitoring.UnitTestApp.Scenarios /// internal static class SpinWaitScenario { - public static CliCommand Command() + public static Command Command() { - CliCommand command = new(TestAppScenarios.SpinWait.Name); + Command command = new(TestAppScenarios.SpinWait.Name); command.SetAction(ExecuteAsync); return command; } diff --git a/src/Tests/Microsoft.Diagnostics.Monitoring.UnitTestApp/Scenarios/StacksScenario.cs b/src/Tests/Microsoft.Diagnostics.Monitoring.UnitTestApp/Scenarios/StacksScenario.cs index 7995e4ba235..83ae056d451 100644 --- a/src/Tests/Microsoft.Diagnostics.Monitoring.UnitTestApp/Scenarios/StacksScenario.cs +++ b/src/Tests/Microsoft.Diagnostics.Monitoring.UnitTestApp/Scenarios/StacksScenario.cs @@ -10,9 +10,9 @@ namespace Microsoft.Diagnostics.Monitoring.UnitTestApp.Scenarios { internal static class StacksScenario { - public static CliCommand Command() + public static Command Command() { - CliCommand command = new(TestAppScenarios.Stacks.Name); + Command command = new(TestAppScenarios.Stacks.Name); command.SetAction(ExecuteAsync); return command; diff --git a/src/Tests/Microsoft.Diagnostics.Monitoring.UnitTestApp/Scenarios/TraceEventsScenario.cs b/src/Tests/Microsoft.Diagnostics.Monitoring.UnitTestApp/Scenarios/TraceEventsScenario.cs index a57104ba37f..baead327ed9 100644 --- a/src/Tests/Microsoft.Diagnostics.Monitoring.UnitTestApp/Scenarios/TraceEventsScenario.cs +++ b/src/Tests/Microsoft.Diagnostics.Monitoring.UnitTestApp/Scenarios/TraceEventsScenario.cs @@ -28,9 +28,9 @@ private sealed class TestScenarioEventSource : EventSource public void UniqueEvent(string message) => WriteEvent(2, message); } - public static CliCommand Command() + public static Command Command() { - CliCommand command = new(TestAppScenarios.TraceEvents.Name); + Command command = new(TestAppScenarios.TraceEvents.Name); command.SetAction(ExecuteAsync); return command; } diff --git a/src/Tools/dotnet-monitor/Program.cs b/src/Tools/dotnet-monitor/Program.cs index 02f32f18e6a..2547446eba4 100644 --- a/src/Tools/dotnet-monitor/Program.cs +++ b/src/Tools/dotnet-monitor/Program.cs @@ -12,9 +12,9 @@ namespace Microsoft.Diagnostics.Tools.Monitor { internal static class Program { - private static CliCommand GenerateApiKeyCommand() + private static Command GenerateApiKeyCommand() { - CliCommand command = new CliCommand( + Command command = new Command( name: "generatekey", description: Strings.HelpDescription_CommandGenerateKey) { @@ -33,9 +33,9 @@ private static CliCommand GenerateApiKeyCommand() return command; } - private static CliCommand CollectCommand() + private static Command CollectCommand() { - CliCommand command = new CliCommand( + Command command = new Command( name: "collect", description: Strings.HelpDescription_CommandCollect) { @@ -68,9 +68,9 @@ private static CliCommand CollectCommand() return command; } - private static CliCommand ConfigCommand() + private static Command ConfigCommand() { - CliCommand showCommand = new CliCommand( + Command showCommand = new Command( name: "show", description: Strings.HelpDescription_CommandShow) { @@ -101,7 +101,7 @@ private static CliCommand ConfigCommand() result.GetValue(ShowSourcesOption)); }); - CliCommand configCommand = new CliCommand( + Command configCommand = new Command( name: "config", description: Strings.HelpDescription_CommandConfig) { @@ -111,102 +111,102 @@ private static CliCommand ConfigCommand() return configCommand; } - private static CliOption UrlsOption = - new CliOption("--urls", "-u") + private static Option UrlsOption = + new Option("--urls", "-u") { DefaultValueFactory = (_) => new[] { "https://localhost:52323" }, Description = Strings.HelpDescription_OptionUrls, HelpName = "urls" }; - private static CliOption MetricUrlsOption = - new CliOption("--metricUrls") + private static Option MetricUrlsOption = + new Option("--metricUrls") { DefaultValueFactory = (_) => new[] { "http://localhost:52325" }, Description = Strings.HelpDescription_OptionMetricsUrls, HelpName = "metricUrls" }; - private static CliOption ProvideMetricsOption = - new CliOption("--metrics", "-m") + private static Option ProvideMetricsOption = + new Option("--metrics", "-m") { DefaultValueFactory = (_) => true, Description = Strings.HelpDescription_OptionMetrics, HelpName = "metrics" }; - private static CliOption DiagnosticPortOption = - new CliOption("--diagnostic-port") + private static Option DiagnosticPortOption = + new Option("--diagnostic-port") { Description = Strings.HelpDescription_OptionDiagnosticPort, HelpName = "diagnosticPort" }; - private static CliOption ConfigurationFilePathOption = - new CliOption("--configuration-file-path") + private static Option ConfigurationFilePathOption = + new Option("--configuration-file-path") { Description = Strings.HelpDescription_OptionConfigurationFilePath, HelpName = "configurationFilePath" }; - private static CliOption NoAuthOption = - new CliOption("--no-auth") + private static Option NoAuthOption = + new Option("--no-auth") { DefaultValueFactory = (_) => false, Description = Strings.HelpDescription_OptionNoAuth, HelpName = "noAuth" }; - private static CliOption NoHttpEgressOption = - new CliOption("--no-http-egress") + private static Option NoHttpEgressOption = + new Option("--no-http-egress") { DefaultValueFactory = (_) => false, Description = Strings.HelpDescription_OptionNoHttpEgress, HelpName = "noHttpEgress" }; - private static CliOption TempApiKeyOption = - new CliOption("--temp-apikey") + private static Option TempApiKeyOption = + new Option("--temp-apikey") { DefaultValueFactory = (_) => false, Description = Strings.HelpDescription_OptionTempApiKey, HelpName = "tempApiKey" }; - private static CliOption OutputOption = - new CliOption("--output", "-o") + private static Option OutputOption = + new Option("--output", "-o") { DefaultValueFactory = (_) => OutputFormat.Json, Description = Strings.HelpDescription_OutputFormat, HelpName = "output" }; - private static CliOption ExpirationOption = - new CliOption("--expiration", "-e") + private static Option ExpirationOption = + new Option("--expiration", "-e") { DefaultValueFactory = (_) => AuthConstants.ApiKeyJwtDefaultExpiration, Description = Strings.HelpDescription_Expiration, HelpName = "expiration" }; - private static CliOption ConfigLevelOption = - new CliOption("--level") + private static Option ConfigLevelOption = + new Option("--level") { DefaultValueFactory = (_) => ConfigDisplayLevel.Redacted, Description = Strings.HelpDescription_OptionLevel, HelpName = "level" }; - private static CliOption ShowSourcesOption = - new CliOption("--show-sources") + private static Option ShowSourcesOption = + new Option("--show-sources") { DefaultValueFactory = (_) => false, Description = Strings.HelpDescription_OptionShowSources, HelpName = "showSources" }; - private static CliOption ExitOnStdinDisconnect = - new CliOption("--exit-on-stdin-disconnect") + private static Option ExitOnStdinDisconnect = + new Option("--exit-on-stdin-disconnect") { DefaultValueFactory = (_) => false, Description = Strings.HelpDescription_OptionExitOnStdinDisconnect @@ -219,7 +219,7 @@ public static Task Main(string[] args) TestAssemblies.SimulateStartupHook(); - CliRootCommand root = new() + RootCommand root = new() { CollectCommand(), ConfigCommand(), From 358397cc6fced604b1c8c1676b07fd4efbb16bf4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 24 Jan 2025 06:18:04 +0000 Subject: [PATCH 563/568] Update dependencies from https://github.com/dotnet/diagnostics build 20250123.1 (#7855) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b508824cf9c..f60ba15c3df 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 4442a188f9200a57635373dcd640893c0e8dcc78 - + https://github.com/dotnet/diagnostics - 9ec1e8573b7379918fca745c60eb33039cfc7a13 + 6ffe0f03902ec9e58d54e89c54bf5e9cd5e76c96 - + https://github.com/dotnet/diagnostics - 9ec1e8573b7379918fca745c60eb33039cfc7a13 + 6ffe0f03902ec9e58d54e89c54bf5e9cd5e76c96 https://github.com/dotnet/command-line-api @@ -42,9 +42,9 @@ https://github.com/dotnet/arcade c4bbc67763bf0c5a868862df874079380e647d61 - + https://github.com/dotnet/diagnostics - 9ec1e8573b7379918fca745c60eb33039cfc7a13 + 6ffe0f03902ec9e58d54e89c54bf5e9cd5e76c96 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 54d5b0cb0ab..d3aeef8fd5f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.25072.1 - 9.0.0-preview.25071.1 - 9.0.0-preview.25071.1 + 9.0.0-preview.25073.1 + 9.0.0-preview.25073.1 9.0.0-preview.24629.2 @@ -67,7 +67,7 @@ 9.0.103-servicing.25065.25 - 1.0.607101 + 1.0.607301 $(MicrosoftNETCoreApp31Version) From 87222f197c0ebd3a9160d15db72a67a6aff49703 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 26 Jan 2025 06:11:23 +0000 Subject: [PATCH 564/568] Update dependencies from https://github.com/dotnet/diagnostics build 20250125.2 (#7859) [feature/9.x] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f60ba15c3df..f62aa2d2c63 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 4442a188f9200a57635373dcd640893c0e8dcc78 - + https://github.com/dotnet/diagnostics - 6ffe0f03902ec9e58d54e89c54bf5e9cd5e76c96 + de1a9b87a00e26b76b96ba88f63aabb3c1e9b777 - + https://github.com/dotnet/diagnostics - 6ffe0f03902ec9e58d54e89c54bf5e9cd5e76c96 + de1a9b87a00e26b76b96ba88f63aabb3c1e9b777 https://github.com/dotnet/command-line-api @@ -42,9 +42,9 @@ https://github.com/dotnet/arcade c4bbc67763bf0c5a868862df874079380e647d61 - + https://github.com/dotnet/diagnostics - 6ffe0f03902ec9e58d54e89c54bf5e9cd5e76c96 + de1a9b87a00e26b76b96ba88f63aabb3c1e9b777 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index d3aeef8fd5f..40fb5960b6a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.25072.1 - 9.0.0-preview.25073.1 - 9.0.0-preview.25073.1 + 9.0.0-preview.25075.2 + 9.0.0-preview.25075.2 9.0.0-preview.24629.2 @@ -67,7 +67,7 @@ 9.0.103-servicing.25065.25 - 1.0.607301 + 1.0.607502 $(MicrosoftNETCoreApp31Version) From 2ea84db189577de479cbeffd77edffdbf5736ee1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 29 Jan 2025 13:26:47 -0800 Subject: [PATCH 565/568] [feature/9.x] Update dependencies from dotnet/roslyn-analyzers (#7857) * Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20250124.2 Microsoft.CodeAnalysis.NetAnalyzers From Version 9.0.0-preview.24629.2 -> To Version 9.0.0-preview.25074.2 * Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20250126.3 Microsoft.CodeAnalysis.NetAnalyzers From Version 9.0.0-preview.24629.2 -> To Version 9.0.0-preview.25076.3 --------- Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f62aa2d2c63..6bd6471aecb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -18,9 +18,9 @@ - + https://github.com/dotnet/roslyn-analyzers - 5bfaf6aea5cf9d1c924d9adc69916eac3be07880 + 16865ea61910500f1022ad2b96c499e5df02c228 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 40fb5960b6a..690b07fa93a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -60,7 +60,7 @@ 9.0.0-preview.25075.2 9.0.0-preview.25075.2 - 9.0.0-preview.24629.2 + 9.0.0-preview.25076.3 9.0.1 9.0.1-servicing.24610.10 From cfe85b8dcc52ad811243a9183aa52e25470b5ecc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 29 Jan 2025 13:27:43 -0800 Subject: [PATCH 566/568] Update dependencies from https://github.com/dotnet/diagnostics build 20250127.1 (#7862) Microsoft.Diagnostics.Monitoring , Microsoft.Diagnostics.Monitoring.EventPipe , Microsoft.FileFormats From Version 9.0.0-preview.25075.2 -> To Version 9.0.0-preview.25077.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6bd6471aecb..035164c4ccf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 4442a188f9200a57635373dcd640893c0e8dcc78 - + https://github.com/dotnet/diagnostics - de1a9b87a00e26b76b96ba88f63aabb3c1e9b777 + d17085c285c6550b8a1a11ded6b38355be39edee - + https://github.com/dotnet/diagnostics - de1a9b87a00e26b76b96ba88f63aabb3c1e9b777 + d17085c285c6550b8a1a11ded6b38355be39edee https://github.com/dotnet/command-line-api @@ -42,9 +42,9 @@ https://github.com/dotnet/arcade c4bbc67763bf0c5a868862df874079380e647d61 - + https://github.com/dotnet/diagnostics - de1a9b87a00e26b76b96ba88f63aabb3c1e9b777 + d17085c285c6550b8a1a11ded6b38355be39edee https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 690b07fa93a..41aa7f11f5e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.25072.1 - 9.0.0-preview.25075.2 - 9.0.0-preview.25075.2 + 9.0.0-preview.25077.1 + 9.0.0-preview.25077.1 9.0.0-preview.25076.3 @@ -67,7 +67,7 @@ 9.0.103-servicing.25065.25 - 1.0.607502 + 1.0.607701 $(MicrosoftNETCoreApp31Version) From 8ae0efc3b08ba969a4799ac0be269887ee611fd0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 29 Jan 2025 16:59:10 -0800 Subject: [PATCH 567/568] [feature/9.x] Bump the identity-dependencies group in /eng/dependabot/independent with 3 updates (#7856) * [feature/9.x] Bump the identity-dependencies group Bumps the identity-dependencies group in /eng/dependabot/independent with 3 updates: [Azure.Core](https://github.com/Azure/azure-sdk-for-net), [Azure.Identity](https://github.com/Azure/azure-sdk-for-net) and [Microsoft.Identity.Web](https://github.com/AzureAD/microsoft-identity-web). Updates `Azure.Core` from 1.44.1 to 1.38.0 - [Release notes](https://github.com/Azure/azure-sdk-for-net/releases) - [Commits](https://github.com/Azure/azure-sdk-for-net/compare/Azure.Core_1.44.1...Azure.Core_1.38.0) Updates `Azure.Identity` from 1.13.2 to 1.11.4 - [Release notes](https://github.com/Azure/azure-sdk-for-net/releases) - [Commits](https://github.com/Azure/azure-sdk-for-net/compare/Azure.Identity_1.13.2...Azure.Identity_1.11.4) Updates `Microsoft.Identity.Web` from 3.5.0 to 3.6.2 - [Release notes](https://github.com/AzureAD/microsoft-identity-web/releases) - [Changelog](https://github.com/AzureAD/microsoft-identity-web/blob/master/changelog.md) - [Commits](https://github.com/AzureAD/microsoft-identity-web/compare/3.5.0...3.6.2) --- updated-dependencies: - dependency-name: Azure.Core dependency-type: direct:production update-type: version-update:semver-minor dependency-group: identity-dependencies - dependency-name: Azure.Identity dependency-type: direct:production update-type: version-update:semver-minor dependency-group: identity-dependencies - dependency-name: Microsoft.Identity.Web dependency-type: direct:production update-type: version-update:semver-minor dependency-group: identity-dependencies ... Signed-off-by: dependabot[bot] * Suppress TFM support for functional tests for .NET 6 and 7 --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Justin Anderson --- eng/dependabot/independent/Versions.props | 2 +- ...Diagnostics.Monitoring.Tool.FunctionalTests.csproj | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/eng/dependabot/independent/Versions.props b/eng/dependabot/independent/Versions.props index 0bb43f882f0..ca2cf44eb94 100644 --- a/eng/dependabot/independent/Versions.props +++ b/eng/dependabot/independent/Versions.props @@ -6,7 +6,7 @@ 1.13.2 12.23.0 12.21.0 - 3.5.0 + 3.6.2 1.6.23 4.3.2 5.0.0 diff --git a/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests/Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests.csproj b/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests/Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests.csproj index d3212d57d1e..806c921baab 100644 --- a/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests/Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests.csproj +++ b/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests/Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests.csproj @@ -4,6 +4,17 @@ $(TestTargetFrameworks) $(DefineConstants);UNITTEST + + + true + + + true + From 60e8ba4fc2d6608339952bcb4b6cbeb3c9543e18 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 30 Jan 2025 13:43:41 -0800 Subject: [PATCH 568/568] Update dependencies from https://github.com/dotnet/arcade build 20250127.4 (#7863) Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.25065.2 -> To Version 9.0.0-beta.25077.4 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- eng/common/internal/Tools.csproj | 10 ---------- global.json | 4 ++-- 4 files changed, 15 insertions(+), 25 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 035164c4ccf..29274176ff7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,25 +22,25 @@ https://github.com/dotnet/roslyn-analyzers 16865ea61910500f1022ad2b96c499e5df02c228 - + https://github.com/dotnet/arcade - c4bbc67763bf0c5a868862df874079380e647d61 + bac7e1caea791275b7c3ccb4cb75fd6a04a26618 - + https://github.com/dotnet/arcade - c4bbc67763bf0c5a868862df874079380e647d61 + bac7e1caea791275b7c3ccb4cb75fd6a04a26618 - + https://github.com/dotnet/arcade - c4bbc67763bf0c5a868862df874079380e647d61 + bac7e1caea791275b7c3ccb4cb75fd6a04a26618 - + https://github.com/dotnet/arcade - c4bbc67763bf0c5a868862df874079380e647d61 + bac7e1caea791275b7c3ccb4cb75fd6a04a26618 - + https://github.com/dotnet/arcade - c4bbc67763bf0c5a868862df874079380e647d61 + bac7e1caea791275b7c3ccb4cb75fd6a04a26618 https://github.com/dotnet/diagnostics diff --git a/eng/Versions.props b/eng/Versions.props index 41aa7f11f5e..45a3e926976 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,9 +48,9 @@ --> - 9.0.0-beta.25065.2 - 9.0.0-beta.25065.2 - 9.0.0-beta.25065.2 + 9.0.0-beta.25077.4 + 9.0.0-beta.25077.4 + 9.0.0-beta.25077.4 9.0.1 9.0.1-rtm.24610.9 diff --git a/eng/common/internal/Tools.csproj b/eng/common/internal/Tools.csproj index 32f79dfb340..feaa6d20812 100644 --- a/eng/common/internal/Tools.csproj +++ b/eng/common/internal/Tools.csproj @@ -15,16 +15,6 @@ - - - - https://devdiv.pkgs.visualstudio.com/_packaging/dotnet-core-internal-tooling/nuget/v3/index.json; - - - $(RestoreSources); - https://devdiv.pkgs.visualstudio.com/_packaging/VS/nuget/v3/index.json; - - diff --git a/global.json b/global.json index a9fca091c49..fc22e9445c9 100644 --- a/global.json +++ b/global.json @@ -30,7 +30,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25065.2", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25065.2" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25077.4", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25077.4" } }