From 61a252dfbcbfa6dc52f09bbc9ed681c9160e3156 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 16 Apr 2024 18:44:05 +0000 Subject: [PATCH 1/8] Update dependencies from https://github.com/dotnet/source-build-externals build 20240416.1 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.24175.3 -> To Version 8.0.0-alpha.1.24216.1 --- NuGet.config | 21 --------------------- eng/Version.Details.xml | 4 ++-- 2 files changed, 2 insertions(+), 23 deletions(-) diff --git a/NuGet.config b/NuGet.config index 8bdc3ffd2..c8bd4d7c7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,14 +7,8 @@ - - - - - - @@ -22,14 +16,8 @@ - - - - - - @@ -49,20 +37,11 @@ - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9715e91d6..c7bf8f808 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -193,9 +193,9 @@ 5957c5c5f85f17c145e7fab4ece37ad6aafcded9 - + https://github.com/dotnet/source-build-externals - 300e99190e6ae1983681694dbdd5f75f0c692081 + 908177a58a41532b3302c17f1e1a8cf1c1234545 From 903e15eef9f13b981188168050ea89d53fbff26c Mon Sep 17 00:00:00 2001 From: Rich Lander Date: Wed, 17 Apr 2024 13:54:08 -0700 Subject: [PATCH 2/8] Update-eol-versions-8.0.1xx (#19318) Co-authored-by: Michael Simons --- .vsts-ci.yml | 22 +++++++++---------- .vsts-pr.yml | 10 ++++----- eng/pipelines/templates/stages/vmr-build.yml | 6 ++--- .../pipelines/source-build-sdk-diff-tests.yml | 8 +++---- 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 4c70535d7..892fd8c7b 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -52,20 +52,20 @@ extends: template: v1/1ES.Unofficial.PipelineTemplate.yml@1esPipelines parameters: containers: - alpine315WithNode: - image: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.15-WithNode + alpine319WithNode: + image: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19-WithNode cblMariner20Fpm: image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-fpm centosStream8: image: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8 - debianStretch: - image: mcr.microsoft.com/dotnet-buildtools/prereqs:debian-stretch + debian11: + image: mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-amd64 fedora36: image: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-36 ubuntu2204: image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04 - ubuntu1804Cross: - image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-cross + mariner20CrossArm: + image: mcr.microsoft.com/dotnet-buildtools/prereqs:mariner-2.0-cross-arm ubuntu2204DebPkg: image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-debpkg sdl: @@ -141,8 +141,8 @@ extends: - template: eng/build.yml@self parameters: agentOs: Linux - jobName: Build_Debian_Stretch_Debug_x64 - container: debianStretch + jobName: Build_Debian_11_Debug_x64 + container: debian11 buildConfiguration: Debug buildArchitecture: x64 additionalBuildParameters: '/p:BuildSdkDeb=true' @@ -162,7 +162,7 @@ extends: parameters: agentOs: Linux jobName: Build_Linux_musl_Debug_x64 - container: alpine315WithNode + container: alpine319WithNode buildConfiguration: Debug buildArchitecture: x64 runtimeIdentifier: 'linux-musl-x64' @@ -237,7 +237,7 @@ extends: parameters: agentOs: Linux jobName: Build_Linux_musl_Release_arm - container: ubuntu1804Cross + container: mariner20CrossArm buildConfiguration: Release buildArchitecture: arm runtimeIdentifier: 'linux-musl-arm' @@ -258,7 +258,7 @@ extends: parameters: agentOs: Linux jobName: Build_Linux_musl_Release_x64 - container: alpine315WithNode + container: alpine319WithNode buildConfiguration: Release buildArchitecture: x64 runtimeIdentifier: 'linux-musl-x64' diff --git a/.vsts-pr.yml b/.vsts-pr.yml index f5c697bab..94d0f59ce 100644 --- a/.vsts-pr.yml +++ b/.vsts-pr.yml @@ -100,8 +100,8 @@ stages: - template: eng/build-pr.yml parameters: agentOs: Linux - jobName: Build_Debian_Stretch_Debug_x64 - container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:debian-stretch' + jobName: Build_Debian_11_Debug_x64 + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-amd64' buildConfiguration: Debug buildArchitecture: x64 additionalBuildParameters: '/p:BuildSdkDeb=true' @@ -121,7 +121,7 @@ stages: parameters: agentOs: Linux jobName: Build_Linux_musl_Debug_x64 - container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.15-WithNode' + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19-WithNode' buildConfiguration: Debug buildArchitecture: x64 runtimeIdentifier: 'linux-musl-x64' @@ -201,7 +201,7 @@ stages: parameters: agentOs: Linux jobName: Build_Linux_musl_Release_arm - container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-cross' + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:mariner-2.0-cross-arm' buildConfiguration: Release buildArchitecture: arm runtimeIdentifier: 'linux-musl-arm' @@ -222,7 +222,7 @@ stages: parameters: agentOs: Linux jobName: Build_Linux_musl_Release_x64 - container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.15-WithNode' + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19-WithNode' buildConfiguration: Release buildArchitecture: x64 runtimeIdentifier: 'linux-musl-x64' diff --git a/eng/pipelines/templates/stages/vmr-build.yml b/eng/pipelines/templates/stages/vmr-build.yml index 2f9692f22..38451ade2 100644 --- a/eng/pipelines/templates/stages/vmr-build.yml +++ b/eng/pipelines/templates/stages/vmr-build.yml @@ -21,9 +21,9 @@ parameters: # The following parameters aren't expected to be passed in rather they are used for encapsulation # ----------------------------------------------------------------------------------------------- -- name: alpine317Container +- name: alpine319Container type: string - default: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.17 + default: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19 - name: centOSStream8Container type: string default: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8 @@ -120,7 +120,7 @@ stages: vmrBranch: ${{ variables.VmrBranch }} architecture: x64 pool: ${{ parameters.pool_Linux }} - container: ${{ parameters.alpine317Container }} + container: ${{ parameters.alpine319Container }} buildFromArchive: false # ✅ enablePoison: false # 🚫 excludeOmniSharpTests: true # ✅ diff --git a/src/SourceBuild/content/eng/pipelines/source-build-sdk-diff-tests.yml b/src/SourceBuild/content/eng/pipelines/source-build-sdk-diff-tests.yml index 36eed8cbd..4e49c7fa8 100644 --- a/src/SourceBuild/content/eng/pipelines/source-build-sdk-diff-tests.yml +++ b/src/SourceBuild/content/eng/pipelines/source-build-sdk-diff-tests.yml @@ -1,6 +1,6 @@ schedules: -- cron: "0 11 * * 1-5" - displayName: Run on weekdays at 11am UTC +- cron: "0 11 * * 1-5" + displayName: Run on weekdays at 11am UTC branches: include: - main @@ -47,8 +47,8 @@ jobs: - template: templates/jobs/sdk-diff-tests.yml parameters: - buildName: Alpine317_Offline_MsftSdk - targetRid: alpine.3.17-x64 + buildName: Alpine319_Offline_MsftSdk + targetRid: alpine.3.19-x64 architecture: x64 dotnetDotnetRunId: ${{ parameters.dotnetDotnetRunId }} From 7df35f99cc54dcf97a479efb1745ccb3c68ab2cc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 18 Apr 2024 17:22:27 +0000 Subject: [PATCH 3/8] Update dependencies from https://github.com/dotnet/sdk build 20240418.5 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24217.11 -> To Version 8.0.300-preview.24218.5 Dependency coherency updates Microsoft.Build From Version 17.10.3 -> To Version 17.10.4 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/NuGet.config b/NuGet.config index 0e369ee7c..4e27eeb09 100644 --- a/NuGet.config +++ b/NuGet.config @@ -15,7 +15,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 481690b95..60a7e1a6b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - d8c64264eeff1bc6aa543d064ba1bc74cabf06d6 + 738bfb1d41ed4dcbdbf59be8f7ae2fe11dbba9e0 - + https://github.com/dotnet/sdk - d8c64264eeff1bc6aa543d064ba1bc74cabf06d6 + 738bfb1d41ed4dcbdbf59be8f7ae2fe11dbba9e0 - + https://github.com/dotnet/sdk - d8c64264eeff1bc6aa543d064ba1bc74cabf06d6 + 738bfb1d41ed4dcbdbf59be8f7ae2fe11dbba9e0 - + https://github.com/dotnet/sdk - d8c64264eeff1bc6aa543d064ba1bc74cabf06d6 + 738bfb1d41ed4dcbdbf59be8f7ae2fe11dbba9e0 https://github.com/dotnet/test-templates @@ -155,9 +155,9 @@ 3af0081a6e811b78d37c62e479914f7f4cfb0d1a - + https://github.com/dotnet/msbuild - fc97b2d1f7c2309d0069dfbd4ab73e4779ad6989 + 10fbfbf2eeb0597fdc1f600d87d38c7f57317bdc https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index 8a397962e..95ec56196 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -79,9 +79,9 @@ - 8.0.300-preview.24217.11 - 8.0.300-preview.24217.11 - 8.0.300-preview.24217.11 + 8.0.300-preview.24218.5 + 8.0.300-preview.24218.5 + 8.0.300-preview.24218.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 21345f55b7eb12ff472cc7dcd7e4b33afc5280e0 Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Thu, 18 Apr 2024 23:36:20 -0700 Subject: [PATCH 4/8] Fix buildName --- eng/pipelines/templates/stages/vmr-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/templates/stages/vmr-build.yml b/eng/pipelines/templates/stages/vmr-build.yml index 6ee12e92e..51597c437 100644 --- a/eng/pipelines/templates/stages/vmr-build.yml +++ b/eng/pipelines/templates/stages/vmr-build.yml @@ -112,7 +112,7 @@ stages: - template: ../jobs/vmr-build.yml parameters: # Changing the build name requires updating the referenced name in the source-build-sdk-diff-tests.yml pipeline - buildName: Alpine317_Offline_MsftSdk + buildName: Alpine319_Offline_MsftSdk isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }} vmrBranch: ${{ variables.VmrBranch }} architecture: x64 From 1cd8a406af146dc655070bbecaae17039bf14d3f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 19 Apr 2024 12:49:49 +0000 Subject: [PATCH 5/8] Update dependencies from https://github.com/dotnet/arcade-services build 20240419.1 Microsoft.DotNet.Darc , Microsoft.DotNet.DarcLib From Version 1.1.0-beta.24217.2 -> To Version 1.1.0-beta.24219.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 6ea86b699..5ac60fd57 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.24217.2", + "version": "1.1.0-beta.24219.1", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 60a7e1a6b..65c328f71 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 - 14a0472100fa9180aca3d178de0b2893ecb22f14 + 611a6bbd68d99a312d688b49733edc894ea0c3c1 - + https://github.com/dotnet/arcade-services - 14a0472100fa9180aca3d178de0b2893ecb22f14 + 611a6bbd68d99a312d688b49733edc894ea0c3c1 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index c531515e2..8c1771a99 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -43,7 +43,7 @@ - 1.1.0-beta.24217.2 + 1.1.0-beta.24219.1 From ceb2adce4f0a4ac3d815e629bd6fcf13b27b89fa Mon Sep 17 00:00:00 2001 From: Ella Hathaway <67609881+ellahathaway@users.noreply.github.com> Date: Fri, 19 Apr 2024 06:22:44 -0700 Subject: [PATCH 6/8] [8.0.1xx] Use correct image name for Arm pool (#19531) --- eng/pipelines/templates/stages/vmr-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/templates/stages/vmr-build.yml b/eng/pipelines/templates/stages/vmr-build.yml index 38451ade2..8c48d95dd 100644 --- a/eng/pipelines/templates/stages/vmr-build.yml +++ b/eng/pipelines/templates/stages/vmr-build.yml @@ -54,7 +54,7 @@ parameters: default: name: $(poolName_LinuxArm64) image: $(poolImage_LinuxArm64) - demands: ImageOverride -equals $(poolImage_Linux) + demands: ImageOverride -equals $(poolImage_LinuxArm64) hostArchitecture: Arm64 os: linux From 46532a34a8267f7a5aea214563138c2cac7ff4af Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Fri, 19 Apr 2024 09:44:31 -0500 Subject: [PATCH 7/8] Rename out of date alpine CI leg (#19542) --- eng/pipelines/templates/stages/vmr-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/templates/stages/vmr-build.yml b/eng/pipelines/templates/stages/vmr-build.yml index 8c48d95dd..fdf3180c9 100644 --- a/eng/pipelines/templates/stages/vmr-build.yml +++ b/eng/pipelines/templates/stages/vmr-build.yml @@ -115,7 +115,7 @@ stages: - template: ../jobs/vmr-build.yml@self parameters: # Changing the build name requires updating the referenced name in the source-build-sdk-diff-tests.yml pipeline - buildName: Alpine317_Offline_MsftSdk + buildName: Alpine319_Offline_MsftSdk isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }} vmrBranch: ${{ variables.VmrBranch }} architecture: x64 From 05ce03283e97259a8d9cac235bc0d3c1ce249713 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Fri, 19 Apr 2024 12:10:36 -0700 Subject: [PATCH 8/8] [release/8.0.1xx] Source-build dotnet/runtime patch: crashinfo.cpp/crasinfounix.cpp: use off_t instead of off64_t (#19544) Co-authored-by: Michael Simons --- ...ashinfo-use-off_t-instead-of-off64_t.patch | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 src/SourceBuild/patches/runtime/0001-crashinfo-use-off_t-instead-of-off64_t.patch diff --git a/src/SourceBuild/patches/runtime/0001-crashinfo-use-off_t-instead-of-off64_t.patch b/src/SourceBuild/patches/runtime/0001-crashinfo-use-off_t-instead-of-off64_t.patch new file mode 100644 index 000000000..6569164b8 --- /dev/null +++ b/src/SourceBuild/patches/runtime/0001-crashinfo-use-off_t-instead-of-off64_t.patch @@ -0,0 +1,38 @@ +From 05ad51a9be428012328a1ee199a4edaff20b5efe Mon Sep 17 00:00:00 2001 +From: Antoine Martin +Date: Tue, 12 Sep 2023 18:55:46 -0400 +Subject: [PATCH] crashinfo.cpp/crasinfounix.cpp: use off_t instead of off64_t + +Backport: https://github.com/dotnet/runtime/pull/101272 + +--- + src/coreclr/debug/createdump/crashinfo.cpp | 2 +- + src/coreclr/debug/createdump/crashinfounix.cpp | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/coreclr/debug/createdump/crashinfo.cpp b/src/coreclr/debug/createdump/crashinfo.cpp +index 996f3a81935d..d1d1b0ea0218 100644 +--- a/src/coreclr/debug/createdump/crashinfo.cpp ++++ b/src/coreclr/debug/createdump/crashinfo.cpp +@@ -803,7 +803,7 @@ CrashInfo::PageMappedToPhysicalMemory(uint64_t start) + } + + uint64_t pagemapOffset = (start / PAGE_SIZE) * sizeof(uint64_t); +- uint64_t seekResult = lseek64(m_fdPagemap, (off64_t) pagemapOffset, SEEK_SET); ++ uint64_t seekResult = lseek(m_fdPagemap, (off_t) pagemapOffset, SEEK_SET); + if (seekResult != pagemapOffset) + { + int seekErrno = errno; +diff --git a/src/coreclr/debug/createdump/crashinfounix.cpp b/src/coreclr/debug/createdump/crashinfounix.cpp +index 24b975e3d655..2f4ea079de3b 100644 +--- a/src/coreclr/debug/createdump/crashinfounix.cpp ++++ b/src/coreclr/debug/createdump/crashinfounix.cpp +@@ -516,7 +516,7 @@ CrashInfo::ReadProcessMemory(void* address, void* buffer, size_t size, size_t* r + // performance optimization. + m_canUseProcVmReadSyscall = false; + assert(m_fdMem != -1); +- *read = pread64(m_fdMem, buffer, size, (off64_t)address); ++ *read = pread(m_fdMem, buffer, size, (off_t)address); + } + + if (*read == (size_t)-1)