From d12c226fabddeba48e5d967485ead81de22d4768 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 12 Mar 2025 22:24:44 +0000 Subject: [PATCH 1/3] Update dependencies from https://github.com/dotnet/arcade build 20250220.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.25114.5 -> To Version 8.0.0-beta.25120.1 --- NuGet.config | 16 ++++++++++++++-- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- eng/common/cross/toolchain.cmake | 4 ++++ global.json | 4 ++-- 5 files changed, 30 insertions(+), 14 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3d39cef95a36..881e8276de3a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,6 +4,8 @@ + + @@ -19,6 +21,8 @@ + + @@ -27,14 +31,16 @@ + + - - + + @@ -59,6 +65,8 @@ + + @@ -74,9 +82,13 @@ + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4fb092505667..a517b16943ef 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -491,22 +491,22 @@ - + https://github.com/dotnet/arcade - 221fba21fbd6a29f17af7a7004f8ef18a51519bd + 4ff4ce248e95ae74b0040de6a6c5939aa63120dc - + https://github.com/dotnet/arcade - 221fba21fbd6a29f17af7a7004f8ef18a51519bd + 4ff4ce248e95ae74b0040de6a6c5939aa63120dc - + https://github.com/dotnet/arcade - 221fba21fbd6a29f17af7a7004f8ef18a51519bd + 4ff4ce248e95ae74b0040de6a6c5939aa63120dc - + https://github.com/dotnet/arcade - 221fba21fbd6a29f17af7a7004f8ef18a51519bd + 4ff4ce248e95ae74b0040de6a6c5939aa63120dc https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 499146b39dcb..e8f52430cc2c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -34,7 +34,7 @@ 7.0.0 4.0.0 7.0.0 - 8.0.0-beta.25114.5 + 8.0.0-beta.25120.1 7.0.0-preview.22423.2 8.0.0 4.3.0 @@ -209,7 +209,7 @@ 6.12.0 6.1.0 - 8.0.0-beta.25114.5 + 8.0.0-beta.25120.1 4.18.4 1.3.2 8.0.0-beta.23607.1 diff --git a/eng/common/cross/toolchain.cmake b/eng/common/cross/toolchain.cmake index dafabdcaef00..f93dc440df0e 100644 --- a/eng/common/cross/toolchain.cmake +++ b/eng/common/cross/toolchain.cmake @@ -280,6 +280,8 @@ elseif(TARGET_ARCH_NAME MATCHES "^(arm64|x64)$") add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/usr/lib64") add_toolchain_linker_flag("-Wl,--rpath-link=${TIZEN_TOOLCHAIN_PATH}") endif() +elseif(TARGET_ARCH_NAME STREQUAL "s390x") + add_toolchain_linker_flag("--target=${TOOLCHAIN}") elseif(TARGET_ARCH_NAME STREQUAL "x86") if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/i586-alpine-linux-musl) add_toolchain_linker_flag("--target=${TOOLCHAIN}") @@ -327,6 +329,8 @@ if(TARGET_ARCH_NAME MATCHES "^(arm|armel)$") if(TARGET_ARCH_NAME STREQUAL "armel") add_compile_options(-mfloat-abi=softfp) endif() +elseif(TARGET_ARCH_NAME STREQUAL "s390x") + add_compile_options("--target=${TOOLCHAIN}") elseif(TARGET_ARCH_NAME STREQUAL "x86") if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/i586-alpine-linux-musl) add_compile_options(--target=${TOOLCHAIN}) diff --git a/global.json b/global.json index 29e4c494df4e..d6b08a6813f8 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25114.5", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25114.5" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25120.1", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25120.1" } } From 27f44d6312792c01018242288abc9456a2f22fb0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 13 Mar 2025 04:00:58 +0000 Subject: [PATCH 2/3] Update dependencies from https://github.com/dotnet/templating build 20250312.2 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.115-servicing.25156.8 -> To Version 8.0.115-servicing.25162.2 --- NuGet.config | 18 +++++++++++++++--- eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 2 +- 3 files changed, 21 insertions(+), 9 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3d39cef95a36..cd0b2e883244 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,6 +4,8 @@ + + @@ -19,6 +21,8 @@ + + @@ -27,14 +31,16 @@ + + - - - + + + @@ -59,6 +65,8 @@ + + @@ -74,9 +82,13 @@ + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4fb092505667..8e8bfba866fd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,15 +3,15 @@ https://github.com/dotnet/templating - 0da2c6ec19a265dd1478a9fb736c02117c907179 + e779fed31bb4e3f62b17133cac1cf9de44a3288d - + https://github.com/dotnet/templating - 0da2c6ec19a265dd1478a9fb736c02117c907179 + e779fed31bb4e3f62b17133cac1cf9de44a3288d - + https://github.com/dotnet/templating - 0da2c6ec19a265dd1478a9fb736c02117c907179 + e779fed31bb4e3f62b17133cac1cf9de44a3288d diff --git a/eng/Versions.props b/eng/Versions.props index 499146b39dcb..68ea66d80289 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -143,7 +143,7 @@ $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.115-servicing.25156.8 + 8.0.115-servicing.25162.2 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From 09c97f0d3fbdfc0aaee3e481479ff756606abdfa Mon Sep 17 00:00:00 2001 From: Eduardo Villalpando Mello Date: Thu, 13 Mar 2025 17:49:35 -0700 Subject: [PATCH 3/3] [Github Actions] Labels: Add extra labels to check (#47564) --- .github/workflows/pr-analysis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pr-analysis.yml b/.github/workflows/pr-analysis.yml index b74a99c9799b..653869ada03b 100644 --- a/.github/workflows/pr-analysis.yml +++ b/.github/workflows/pr-analysis.yml @@ -1,7 +1,7 @@ name: PR Analysis on: pull_request: - types: [opened, synchronize, labeled, unlabeled] + types: [opened, labeled, unlabeled] permissions: contents: read pull-requests: read @@ -9,6 +9,6 @@ jobs: allowed-labels: runs-on: ubuntu-latest steps: - - name: Return error if branch is in lockdown or 'do not merge' label is present + - name: Return error if blocking labels are present in PR run: echo "Labels on this PR prevent it from being merged. Please contact the repo owners for more information." && exit 1 - if: ${{ contains(github.event.pull_request.labels.*.name, 'Branch Lockdown') || contains(github.event.pull_request.labels.*.name, 'DO NOT MERGE') }} + if: ${{ contains(github.event.pull_request.labels.*.name, 'Branch Lockdown') || contains(github.event.pull_request.labels.*.name, 'DO NOT MERGE') || contains(github.event.pull_request.labels.*.name, 'Servicing-consider') || contains(github.event.pull_request.labels.*.name, 'Servicing-more-info') || contains(github.event.pull_request.labels.*.name, 'Servicing-rejected') }}