From 8f1e5ee61fefd8bff57d4388bc44b041d622faf3 Mon Sep 17 00:00:00 2001 From: Ella Hathaway <67609881+ellahathaway@users.noreply.github.com> Date: Tue, 23 Apr 2024 13:22:11 -0700 Subject: [PATCH 01/15] Publish Test Results in PR Validation (#19533) --- eng/pipelines/templates/jobs/vmr-build.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/eng/pipelines/templates/jobs/vmr-build.yml b/eng/pipelines/templates/jobs/vmr-build.yml index bc986e9f4..19dc418c1 100644 --- a/eng/pipelines/templates/jobs/vmr-build.yml +++ b/eng/pipelines/templates/jobs/vmr-build.yml @@ -266,6 +266,20 @@ jobs: displayName: Prepare BuildLogs staging directory continueOnError: true condition: succeededOrFailed() + + - ${{ if eq(variables['System.TeamProject'], 'public') }}: + - publish: '$(Build.StagingDirectory)/BuildLogs' + artifact: $(Agent.JobName)_BuildLogs_Attempt$(System.JobAttempt) + displayName: Publish BuildLogs + continueOnError: true + condition: succeededOrFailed() + + - publish: '${{ variables.sourcesPath }}/artifacts/${{ parameters.architecture }}/Release/' + artifact: $(Agent.JobName)_Artifacts + displayName: Publish Artifacts + condition: succeededOrFailed() + continueOnError: true + - task: PublishTestResults@2 displayName: Publish Test Results condition: succeededOrFailed() From 44310139cf1a710687c7a445c0c32f18d21f8388 Mon Sep 17 00:00:00 2001 From: Rich Lander Date: Wed, 1 May 2024 06:05:01 -0700 Subject: [PATCH 02/15] Update-mariner-tag (#19617) --- .vsts-ci.yml | 2 +- .vsts-pr.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 892fd8c7b..7c0094f6b 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -65,7 +65,7 @@ extends: ubuntu2204: image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04 mariner20CrossArm: - image: mcr.microsoft.com/dotnet-buildtools/prereqs:mariner-2.0-cross-arm + image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm ubuntu2204DebPkg: image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-debpkg sdl: diff --git a/.vsts-pr.yml b/.vsts-pr.yml index 94d0f59ce..182735bcf 100644 --- a/.vsts-pr.yml +++ b/.vsts-pr.yml @@ -201,7 +201,7 @@ stages: parameters: agentOs: Linux jobName: Build_Linux_musl_Release_arm - container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:mariner-2.0-cross-arm' + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm' buildConfiguration: Release buildArchitecture: arm runtimeIdentifier: 'linux-musl-arm' From 1695d9b47392a0d1c4924edbf6238d91d2b63b0c Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Wed, 1 May 2024 14:46:37 -0700 Subject: [PATCH 03/15] Update branding to 8.0.106 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index d77955771..add1322a0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 8 0 1 - 05 + 06 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) $(VersionMajor).$(VersionMinor) $(MajorMinorVersion).$(VersionSDKMinor) From d2410b5834c2657ed64755c27b498b6a06d13afe Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Wed, 1 May 2024 14:46:45 -0700 Subject: [PATCH 04/15] Update branding to 8.0.301 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 1b8dcefd5..2b04cfa38 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 8 0 3 - 00 + 01 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) $(VersionMajor).$(VersionMinor) $(MajorMinorVersion).$(VersionSDKMinor) From 18160998823b0a50f32ddf324901df830cba0794 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 3 May 2024 12:46:13 +0000 Subject: [PATCH 05/15] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240501.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.24163.3 -> To Version 8.0.0-alpha.1.24251.1 --- 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 c7bf8f808..da136c979 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -239,9 +239,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - 79827eed138fd2575a8b24820b4f385ee4ffb6e6 + 6f814daa935e08b578b1c0c65a1f26ea3317f517 From 5263b6ef0bf7e69b8e416baa1cdce136b9f7dff7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 3 May 2024 12:57:26 +0000 Subject: [PATCH 06/15] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240501.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.24163.3 -> To Version 8.0.0-alpha.1.24251.1 --- 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 adb9cdacf..4cfc3f872 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -239,9 +239,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - 79827eed138fd2575a8b24820b4f385ee4ffb6e6 + 6f814daa935e08b578b1c0c65a1f26ea3317f517 From d1994e4914bb1750b0562de22c71528e58ebffe7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 3 May 2024 17:13:47 +0000 Subject: [PATCH 07/15] [release/8.0.3xx] Update dependencies from dotnet/arcade-services (#19596) [release/8.0.3xx] Update dependencies from dotnet/arcade-services --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 175642a6d..1fd4c8b21 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.24223.1", + "version": "1.1.0-beta.24253.1", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index adb9cdacf..f22482dca 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade 188340e12c0a372b1681ad6a5e72c608021efdba - + https://github.com/dotnet/arcade-services - 0c89e9cbde00179871f262673c78893f1ce5b688 + 27d7e19521190350568160c486bf9126a7daf1c4 - + https://github.com/dotnet/arcade-services - 0c89e9cbde00179871f262673c78893f1ce5b688 + 27d7e19521190350568160c486bf9126a7daf1c4 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 2b04cfa38..63af17c0b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -43,7 +43,7 @@ - 1.1.0-beta.24223.1 + 1.1.0-beta.24253.1 From 8c84835f12c6b7a4089e0347ff4cfe1ddb6cfc33 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 3 May 2024 17:15:16 +0000 Subject: [PATCH 08/15] [release/8.0.3xx] Update dependencies from dotnet/arcade (#19595) [release/8.0.3xx] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f22482dca..8dc1ffec8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -214,18 +214,18 @@ - + https://github.com/dotnet/arcade - 188340e12c0a372b1681ad6a5e72c608021efdba + 67d23f4ba1813b315e7e33c71d18b63475f5c5f8 - + https://github.com/dotnet/arcade - 188340e12c0a372b1681ad6a5e72c608021efdba + 67d23f4ba1813b315e7e33c71d18b63475f5c5f8 - + https://github.com/dotnet/arcade - 188340e12c0a372b1681ad6a5e72c608021efdba + 67d23f4ba1813b315e7e33c71d18b63475f5c5f8 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index 63af17c0b..be68cc5fb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ - 8.0.0-beta.24204.3 + 8.0.0-beta.24225.1 diff --git a/global.json b/global.json index f4af7d9ef..f84be2571 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24204.3", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24204.3" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24225.1", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24225.1" } } From 7671cdb9e7ae898f32ed48af5a1b487a03dd6981 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 4 May 2024 12:30:26 +0000 Subject: [PATCH 09/15] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240501.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.24163.3 -> To Version 8.0.0-alpha.1.24251.1 From 2b6d140f4f9a4d15a0007bfaf32b1686b14ffbd8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 4 May 2024 12:38:43 +0000 Subject: [PATCH 10/15] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240501.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.24163.3 -> To Version 8.0.0-alpha.1.24251.1 From 9c01d5ded2ed7fb63be762cd64a59445eab3c739 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 4 May 2024 12:41:16 +0000 Subject: [PATCH 11/15] Update dependencies from https://github.com/dotnet/arcade-services build 20240503.7 Microsoft.DotNet.Darc , Microsoft.DotNet.DarcLib From Version 1.1.0-beta.24253.1 -> To Version 1.1.0-beta.24253.7 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 1fd4c8b21..9af81c6f3 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.24253.1", + "version": "1.1.0-beta.24253.7", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8dc1ffec8..cadc6fe54 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade 67d23f4ba1813b315e7e33c71d18b63475f5c5f8 - + https://github.com/dotnet/arcade-services - 27d7e19521190350568160c486bf9126a7daf1c4 + 05bd6da6bde53f18a8f1e8c516b778e3f86a5433 - + https://github.com/dotnet/arcade-services - 27d7e19521190350568160c486bf9126a7daf1c4 + 05bd6da6bde53f18a8f1e8c516b778e3f86a5433 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index be68cc5fb..927f74520 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -43,7 +43,7 @@ - 1.1.0-beta.24253.1 + 1.1.0-beta.24253.7 From b26fc36d371f49dd19f19a9a287b4f0f60cf5d70 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 5 May 2024 12:29:53 +0000 Subject: [PATCH 12/15] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240501.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.24163.3 -> To Version 8.0.0-alpha.1.24251.1 From 5f257c68983692ab201ca5c9fbd6d0f3ec87cce5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 5 May 2024 12:38:20 +0000 Subject: [PATCH 13/15] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240501.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.24163.3 -> To Version 8.0.0-alpha.1.24251.1 From 6d799e6219a1cd963fa8c27967f8934fc1a4ffc9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 5 May 2024 12:40:57 +0000 Subject: [PATCH 14/15] Update dependencies from https://github.com/dotnet/arcade-services build 20240503.7 Microsoft.DotNet.Darc , Microsoft.DotNet.DarcLib From Version 1.1.0-beta.24253.1 -> To Version 1.1.0-beta.24253.7 From 373f8b99222de603149a8a375325ac0570436776 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 6 May 2024 12:37:13 +0000 Subject: [PATCH 15/15] Update dependencies from https://github.com/dotnet/arcade-services build 20240506.1 Microsoft.DotNet.Darc , Microsoft.DotNet.DarcLib From Version 1.1.0-beta.24253.7 -> To Version 1.1.0-beta.24256.1 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 9af81c6f3..b8ea93944 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.24253.7", + "version": "1.1.0-beta.24256.1", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f1abcfb71..124ad661d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade 67d23f4ba1813b315e7e33c71d18b63475f5c5f8 - + https://github.com/dotnet/arcade-services - 05bd6da6bde53f18a8f1e8c516b778e3f86a5433 + 1d98f4c0a5b25b72465fe075dd5f24b45ef15c8e - + https://github.com/dotnet/arcade-services - 05bd6da6bde53f18a8f1e8c516b778e3f86a5433 + 1d98f4c0a5b25b72465fe075dd5f24b45ef15c8e https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 927f74520..69b6bfe5c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -43,7 +43,7 @@ - 1.1.0-beta.24253.7 + 1.1.0-beta.24256.1