From 61a252dfbcbfa6dc52f09bbc9ed681c9160e3156 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 16 Apr 2024 18:44:05 +0000 Subject: [PATCH 01/18] 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 02/18] 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 7c3029438df7f0435a1bf886c42f7c488b1b2e85 Mon Sep 17 00:00:00 2001 From: Noah Gilson Date: Thu, 18 Apr 2024 15:42:22 -0700 Subject: [PATCH 03/18] Update implicit versions by 1, because they should be +1 to the existing release, not the no of the existing release --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 04fd5cd0f..9c25125f7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -25,8 +25,8 @@ 30 32 17 - $([MSBuild]::Add($(VersionFeature), 29)) - $([MSBuild]::Add($(VersionFeature), 18)) + $([MSBuild]::Add($(VersionFeature), 30)) + $([MSBuild]::Add($(VersionFeature), 19)) <_NET70ILLinkPackVersion>7.0.100-1.23401.1 From 21345f55b7eb12ff472cc7dcd7e4b33afc5280e0 Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Thu, 18 Apr 2024 23:36:20 -0700 Subject: [PATCH 04/18] 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 05/18] 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 06/18] [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 07/18] 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 08/18] [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) From b7485080588e29890da9156dde0037049245fb0e Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Sun, 21 Apr 2024 10:58:07 -0700 Subject: [PATCH 09/18] skip downlevel targeting tests --- test/SdkTests/TestsToSkipStableSDK.xml | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/test/SdkTests/TestsToSkipStableSDK.xml b/test/SdkTests/TestsToSkipStableSDK.xml index 550025aa6..e0f5b37b7 100644 --- a/test/SdkTests/TestsToSkipStableSDK.xml +++ b/test/SdkTests/TestsToSkipStableSDK.xml @@ -187,10 +187,26 @@ + Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/> + Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/> + + + + From e87ec7118f901c50bfdf95e5819aff873981e4f3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 23 Apr 2024 13:19:08 -0700 Subject: [PATCH 10/18] [release/8.0.3xx] Update dependencies from dotnet/arcade-services (#19564) Co-authored-by: dotnet-maestro[bot] --- .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 5ac60fd57..175642a6d 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.24219.1", + "version": "1.1.0-beta.24223.1", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 65c328f71..adb9cdacf 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 - 611a6bbd68d99a312d688b49733edc894ea0c3c1 + 0c89e9cbde00179871f262673c78893f1ce5b688 - + https://github.com/dotnet/arcade-services - 611a6bbd68d99a312d688b49733edc894ea0c3c1 + 0c89e9cbde00179871f262673c78893f1ce5b688 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 8f57d7e4b..1b8dcefd5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -43,7 +43,7 @@ - 1.1.0-beta.24219.1 + 1.1.0-beta.24223.1 From f839713489df9e536feacd78353822b427bcc06d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 25 Apr 2024 12:51:09 +0000 Subject: [PATCH 11/18] Update dependencies from https://github.com/dotnet/arcade-services build 20240425.1 Microsoft.DotNet.Darc , Microsoft.DotNet.DarcLib From Version 1.1.0-beta.24224.1 -> To Version 1.1.0-beta.24225.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 85dbc5cd4..fb53d2deb 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.24224.1", + "version": "1.1.0-beta.24225.1", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bfb4202ce..b9e061dcf 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 - 0aa6fc6604862f8d85f3b906ac5f18b0fdcae5b9 + 8e43e0e0c43a660221e817c4310764cacbf28977 - + https://github.com/dotnet/arcade-services - 0aa6fc6604862f8d85f3b906ac5f18b0fdcae5b9 + 8e43e0e0c43a660221e817c4310764cacbf28977 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 470439558..a7d9788eb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 1.1.0-beta.24224.1 + 1.1.0-beta.24225.1 From 3200025737515829f05427a78555f9379999ab72 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 25 Apr 2024 12:53:59 +0000 Subject: [PATCH 12/18] Update dependencies from https://github.com/dotnet/sdk build 20240425.3 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.400-preview.24223.25 -> To Version 8.0.400-preview.24225.3 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 12.8.400-beta.24222.1 -> To Version 12.8.400-beta.24223.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 8 ++++---- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bfb4202ce..fd79bb226 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 - 98c312b9e7dde217d658a3b82783625e2eda669f + e5165e281a34877ce115d7ee340adaff17e80a51 - + https://github.com/dotnet/sdk - 98c312b9e7dde217d658a3b82783625e2eda669f + e5165e281a34877ce115d7ee340adaff17e80a51 - + https://github.com/dotnet/sdk - 98c312b9e7dde217d658a3b82783625e2eda669f + e5165e281a34877ce115d7ee340adaff17e80a51 - + https://github.com/dotnet/sdk - 98c312b9e7dde217d658a3b82783625e2eda669f + e5165e281a34877ce115d7ee340adaff17e80a51 https://github.com/dotnet/test-templates @@ -132,13 +132,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 472140dd926227876848e48f41cfc9acb9275492 - + https://github.com/dotnet/fsharp - 96e6c797fda8040f336eafeb5a30abe3a24e383c + 9881e3b215a6b0ae64b83ffacac518314ca6a19d - + https://github.com/dotnet/fsharp - 96e6c797fda8040f336eafeb5a30abe3a24e383c + 9881e3b215a6b0ae64b83ffacac518314ca6a19d @@ -150,14 +150,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://github.com/dotnet/roslyn - a9b690f08634c10b1148102b1eaf49d44d505cfc + 1288876ad028dfe8ad1df03cd5cab46bbec31adb - + https://github.com/dotnet/msbuild - 9cdb3615adb4115f92b390de2f258fac5f320909 + d542f3a80101883083b95fff0b67666b63002751 https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index 470439558..577155a2e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -80,16 +80,16 @@ - 8.0.400-preview.24223.25 - 8.0.400-preview.24223.25 - 8.0.400-preview.24223.25 + 8.0.400-preview.24225.3 + 8.0.400-preview.24225.3 + 8.0.400-preview.24225.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.11.0-1.24223.2 + 4.11.0-1.24223.15 From 0380a3edeaebd080b72f788cb5d59a384e96fbd3 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:14:12 -0700 Subject: [PATCH 13/18] [release/8.0.4xx] Update dependencies from dotnet/arcade-services (#19597) Co-authored-by: dotnet-maestro[bot] --- .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 fb53d2deb..c3ac648cd 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.24225.1", + "version": "1.1.0-beta.24226.1", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3967c04d9..7427bf0be 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 - 8e43e0e0c43a660221e817c4310764cacbf28977 + 43252f97439188c8011a370d5833471f3dd2e6ab - + https://github.com/dotnet/arcade-services - 8e43e0e0c43a660221e817c4310764cacbf28977 + 43252f97439188c8011a370d5833471f3dd2e6ab https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 4d4a26037..c305a2984 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 1.1.0-beta.24225.1 + 1.1.0-beta.24226.1 From 9da252fe9d28b891d69f5d78abc60b855ff63195 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:14:22 -0700 Subject: [PATCH 14/18] [release/8.0.4xx] Update dependencies from dotnet/sdk (#19599) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7427bf0be..9028d031c 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 - e5165e281a34877ce115d7ee340adaff17e80a51 + d8e827456a9ec3eeb8814f5a2049eea9ed1f77d5 - + https://github.com/dotnet/sdk - e5165e281a34877ce115d7ee340adaff17e80a51 + d8e827456a9ec3eeb8814f5a2049eea9ed1f77d5 - + https://github.com/dotnet/sdk - e5165e281a34877ce115d7ee340adaff17e80a51 + d8e827456a9ec3eeb8814f5a2049eea9ed1f77d5 - + https://github.com/dotnet/sdk - e5165e281a34877ce115d7ee340adaff17e80a51 + d8e827456a9ec3eeb8814f5a2049eea9ed1f77d5 https://github.com/dotnet/test-templates @@ -150,9 +150,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://github.com/dotnet/roslyn - 1288876ad028dfe8ad1df03cd5cab46bbec31adb + 75a05d09859425fb1f80f935bcea436d9a265812 diff --git a/eng/Versions.props b/eng/Versions.props index c305a2984..a0bd6cdbc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -80,16 +80,16 @@ - 8.0.400-preview.24225.3 - 8.0.400-preview.24225.3 - 8.0.400-preview.24225.3 + 8.0.400-preview.24225.24 + 8.0.400-preview.24225.24 + 8.0.400-preview.24225.24 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.11.0-1.24223.15 + 4.11.0-1.24224.9 From 1ea805a2a7fef552addf3ecb8bbd3f8fd37854e7 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:15:26 -0700 Subject: [PATCH 15/18] [release/8.0.4xx] Update dependencies from dotnet/arcade (#19598) Co-authored-by: dotnet-maestro[bot] --- 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 9028d031c..ff067a5bb 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 a0bd6cdbc..f7e116719 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,7 +40,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 877a547f9ccec7ae08f1a96ba0ca15ed39035da8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 27 Apr 2024 13:00:45 +0000 Subject: [PATCH 16/18] Update dependencies from https://github.com/dotnet/arcade-services build 20240426.2 Microsoft.DotNet.Darc , Microsoft.DotNet.DarcLib From Version 1.1.0-beta.24226.1 -> To Version 1.1.0-beta.24226.2 --- .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 c3ac648cd..c2ae194fc 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.24226.1", + "version": "1.1.0-beta.24226.2", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ff067a5bb..b91d82a8b 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 - 43252f97439188c8011a370d5833471f3dd2e6ab + f3bd81df8d61d29f64929c853fe18c0c362d751d - + https://github.com/dotnet/arcade-services - 43252f97439188c8011a370d5833471f3dd2e6ab + f3bd81df8d61d29f64929c853fe18c0c362d751d https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 02c37f1b6..444b4e626 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -43,7 +43,7 @@ - 1.1.0-beta.24226.1 + 1.1.0-beta.24226.2 From 363f7eb623c2732c4bea176c12baa3e65569d7de Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 27 Apr 2024 13:03:32 +0000 Subject: [PATCH 17/18] Update dependencies from https://github.com/dotnet/sdk build 20240426.14 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.400-preview.24225.24 -> To Version 8.0.400-preview.24226.14 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset From Version 12.8.400-beta.24223.1 -> To Version 12.8.400-beta.24225.5 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 8 ++++---- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ff067a5bb..dc0ac53f6 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 - d8e827456a9ec3eeb8814f5a2049eea9ed1f77d5 + 7c23a5e9d7aaffe92075ac3e87dbf0629f069e41 - + https://github.com/dotnet/sdk - d8e827456a9ec3eeb8814f5a2049eea9ed1f77d5 + 7c23a5e9d7aaffe92075ac3e87dbf0629f069e41 - + https://github.com/dotnet/sdk - d8e827456a9ec3eeb8814f5a2049eea9ed1f77d5 + 7c23a5e9d7aaffe92075ac3e87dbf0629f069e41 - + https://github.com/dotnet/sdk - d8e827456a9ec3eeb8814f5a2049eea9ed1f77d5 + 7c23a5e9d7aaffe92075ac3e87dbf0629f069e41 https://github.com/dotnet/test-templates @@ -132,13 +132,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 472140dd926227876848e48f41cfc9acb9275492 - + https://github.com/dotnet/fsharp - 9881e3b215a6b0ae64b83ffacac518314ca6a19d + cdc7b66ad9ae171f28995466198b54b3dcd50873 - + https://github.com/dotnet/fsharp - 9881e3b215a6b0ae64b83ffacac518314ca6a19d + cdc7b66ad9ae171f28995466198b54b3dcd50873 @@ -150,9 +150,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://github.com/dotnet/roslyn - 75a05d09859425fb1f80f935bcea436d9a265812 + 5a0ec2b86212e7132cf473b5ccdcf01433c86375 diff --git a/eng/Versions.props b/eng/Versions.props index 02c37f1b6..4a5967374 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -79,16 +79,16 @@ - 8.0.400-preview.24225.24 - 8.0.400-preview.24225.24 - 8.0.400-preview.24225.24 + 8.0.400-preview.24226.14 + 8.0.400-preview.24226.14 + 8.0.400-preview.24226.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.11.0-1.24224.9 + 4.11.0-1.24225.10 From e6c430787f5a98a99a8e5fc7e67e6ac28a4a11ce Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 28 Apr 2024 12:53:07 +0000 Subject: [PATCH 18/18] Update dependencies from https://github.com/dotnet/sdk build 20240427.5 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.400-preview.24226.14 -> To Version 8.0.400-preview.24227.5 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset From Version 12.8.400-beta.24225.5 -> To Version 12.8.400-beta.24226.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 8 ++++---- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8073396ab..9e24e3110 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 - 7c23a5e9d7aaffe92075ac3e87dbf0629f069e41 + 128ca39d0cef065aeb377378a88f7cff5c8ea108 - + https://github.com/dotnet/sdk - 7c23a5e9d7aaffe92075ac3e87dbf0629f069e41 + 128ca39d0cef065aeb377378a88f7cff5c8ea108 - + https://github.com/dotnet/sdk - 7c23a5e9d7aaffe92075ac3e87dbf0629f069e41 + 128ca39d0cef065aeb377378a88f7cff5c8ea108 - + https://github.com/dotnet/sdk - 7c23a5e9d7aaffe92075ac3e87dbf0629f069e41 + 128ca39d0cef065aeb377378a88f7cff5c8ea108 https://github.com/dotnet/test-templates @@ -132,13 +132,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 472140dd926227876848e48f41cfc9acb9275492 - + https://github.com/dotnet/fsharp - cdc7b66ad9ae171f28995466198b54b3dcd50873 + 45ecd2615ddfa6c7bd8e8233b8779f813bb506da - + https://github.com/dotnet/fsharp - cdc7b66ad9ae171f28995466198b54b3dcd50873 + 45ecd2615ddfa6c7bd8e8233b8779f813bb506da @@ -150,9 +150,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://github.com/dotnet/roslyn - 5a0ec2b86212e7132cf473b5ccdcf01433c86375 + 8f9fad13c8b302738d6465ec3b4fe7d5126e1c47 diff --git a/eng/Versions.props b/eng/Versions.props index 10c972797..cdfbcd5b3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -79,16 +79,16 @@ - 8.0.400-preview.24226.14 - 8.0.400-preview.24226.14 - 8.0.400-preview.24226.14 + 8.0.400-preview.24227.5 + 8.0.400-preview.24227.5 + 8.0.400-preview.24227.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.11.0-1.24225.10 + 4.11.0-1.24226.4