From c9449dedb9b62087db1e2cacb6823e2a7bf57f6f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 23 Apr 2024 23:55:12 +0000 Subject: [PATCH] [main] Update dependencies from dotnet/sdk (#19534) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 9.0.0-preview.4.24218.3 to 9.0.0-preview.4.24220.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0: from 9.0.0-preview.4.24218.3 to 9.0.0-preview.4.24220.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0: from 9.0.0-preview.4.24218.3 to 9.0.0-preview.4.24220.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.SharedFramework.x64.9.0: from 9.0.0-preview.4.24218.7 to 9.0.0-preview.4.24222.8 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Ref: from 9.0.0-preview.4.24218.7 to 9.0.0-preview.4.24222.8 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.TargetingPack.x64.9.0: from 9.0.0-preview.4.24218.7 to 9.0.0-preview.4.24222.8 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 9.0.0-preview.4.24218.7 to 9.0.0-preview.4.24222.8 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 9.0.0-preview.4.24218.7 to 9.0.0-preview.4.24222.8 (parent: Microsoft.NET.Sdk) - Microsoft.SourceBuild.Intermediate.runtime.linux-x64: from 9.0.0-preview.4.24218.7 to 9.0.0-preview.4.24222.8 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 9.0.0-preview.4.24218.1 to 9.0.0-preview.4.24223.1 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 9.0.0-preview.4.24218.1 to 9.0.0-preview.4.24223.1 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 9.0.0-preview.4.24218.1 to 9.0.0-preview.4.24223.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0: from 9.0.0-preview.4.24218.1 to 9.0.0-preview.4.24223.1 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 9.0.0-preview.4.24218.1 to 9.0.0-preview.4.24223.1 (parent: Microsoft.NET.Sdk) - dotnet-user-jwts: from 9.0.0-preview.4.24218.1 to 9.0.0-preview.4.24223.1 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 9.0.0-preview.4.24218.1 to 9.0.0-preview.4.24223.1 (parent: Microsoft.NET.Sdk) - Microsoft.SourceBuild.Intermediate.aspnetcore: from 9.0.0-preview.4.24218.1 to 9.0.0-preview.4.24223.1 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 9.0.0-preview.4.24218.3 to 9.0.0-preview.4.24220.1 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 9.0.0-preview.4.24218.3 to 9.0.0-preview.4.24220.1 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 9.0.0-preview.4.24218.2 to 9.0.0-preview.4.24219.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.FSharp.Compiler: from 12.8.400-beta.24218.1 to 12.8.400-beta.24223.1 (parent: Microsoft.NET.Sdk) - Microsoft.SourceBuild.Intermediate.fsharp: from 8.0.400-beta.24218.1 to 8.0.400-beta.24223.1 (parent: Microsoft.NET.Sdk) - Microsoft.NET.ILLink.Tasks: from 9.0.0-preview.4.24218.7 to 9.0.0-preview.4.24222.8 (parent: Microsoft.NET.Sdk) - Microsoft.Net.Compilers.Toolset: from 4.11.0-1.24218.2 to 4.11.0-1.24222.7 (parent: Microsoft.NET.Sdk) - Microsoft.SourceBuild.Intermediate.roslyn: from 4.11.0-1.24218.2 to 4.11.0-1.24222.7 (parent: Microsoft.NET.Sdk) - Microsoft.Build: from 17.11.0-preview-24218-01 to 17.11.0-preview-24222-11 (parent: Microsoft.NET.Sdk) - Microsoft.SourceBuild.Intermediate.msbuild: from 17.11.0-preview-24218-01 to 17.11.0-preview-24222-11 (parent: Microsoft.NET.Sdk) - NuGet.Build.Tasks: from 6.11.0-preview.1.27 to 6.11.0-preview.1.28 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 9.0.0-preview.4.24218.7 to 9.0.0-preview.4.24222.8 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 9.0.0-preview.4.24218.7 to 9.0.0-preview.4.24222.8 (parent: Microsoft.NET.Sdk) - Install node 20.x on windows build to fix aspnetcore build - Merge branch 'main' into darc-main-35a979bc-455b-4e15-b1bf-6da27d06b3a5 - Rebootstrap VMR with arcade changes - Merge branch 'main' into darc-main-35a979bc-455b-4e15-b1bf-6da27d06b3a5 - Remove patches --- eng/Version.Details.xml | 132 +++++++++--------- eng/Versions.props | 46 +++--- eng/pipelines/templates/jobs/vmr-build.yml | 7 + .../content/eng/Version.Details.xml | 4 +- src/SourceBuild/content/eng/Versions.props | 4 +- src/SourceBuild/content/global.json | 4 +- ...n-which-target-RIDs-are-available-wh.patch | 49 ------- .../0001-fix-Alpine-build-break-101302.patch | 36 ----- 8 files changed, 102 insertions(+), 180 deletions(-) delete mode 100644 src/SourceBuild/patches/aspnetcore/0001-Condition-RIDs-on-which-target-RIDs-are-available-wh.patch delete mode 100644 src/SourceBuild/patches/runtime/0001-fix-Alpine-build-break-101302.patch diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7f421e09e..0e6ad625c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,41 +4,41 @@ Source-build uses transitive dependency resolution to determine correct build SHA of all product contributing repos. The order of dependencies is important and should not be modified without approval from dotnet/source-build-internal. --> - + https://github.com/dotnet/windowsdesktop - c8b67095ab5f6342f86e1fb32f8f8038dd381352 + c730f1cc15c964ff65f1f5a6751cdd6c1fed1a46 - + https://github.com/dotnet/windowsdesktop - c8b67095ab5f6342f86e1fb32f8f8038dd381352 + c730f1cc15c964ff65f1f5a6751cdd6c1fed1a46 - + https://github.com/dotnet/windowsdesktop - c8b67095ab5f6342f86e1fb32f8f8038dd381352 + c730f1cc15c964ff65f1f5a6751cdd6c1fed1a46 - + https://github.com/dotnet/windowsdesktop - c8b67095ab5f6342f86e1fb32f8f8038dd381352 + c730f1cc15c964ff65f1f5a6751cdd6c1fed1a46 - + https://github.com/dotnet/runtime - b0118bebe385cb68f272a32ca6a5c5bb53c9b14f + 1c824d929b734db420babbc04f44a1491d8a7efb - + https://github.com/dotnet/runtime - b0118bebe385cb68f272a32ca6a5c5bb53c9b14f + 1c824d929b734db420babbc04f44a1491d8a7efb - + https://github.com/dotnet/runtime - b0118bebe385cb68f272a32ca6a5c5bb53c9b14f + 1c824d929b734db420babbc04f44a1491d8a7efb - + https://github.com/dotnet/runtime - b0118bebe385cb68f272a32ca6a5c5bb53c9b14f + 1c824d929b734db420babbc04f44a1491d8a7efb - + https://github.com/dotnet/runtime - b0118bebe385cb68f272a32ca6a5c5bb53c9b14f + 1c824d929b734db420babbc04f44a1491d8a7efb @@ -46,70 +46,70 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - b0118bebe385cb68f272a32ca6a5c5bb53c9b14f + 1c824d929b734db420babbc04f44a1491d8a7efb - + https://github.com/dotnet/runtime - b0118bebe385cb68f272a32ca6a5c5bb53c9b14f + 1c824d929b734db420babbc04f44a1491d8a7efb - + https://github.com/dotnet/aspnetcore - 7d5309210d8f7bae8fa074da495e9d009d67f1b4 + f18510c2fbdfc11b8144ced4857b3d878fa70965 - + https://github.com/dotnet/aspnetcore - 7d5309210d8f7bae8fa074da495e9d009d67f1b4 + f18510c2fbdfc11b8144ced4857b3d878fa70965 - + https://github.com/dotnet/aspnetcore - 7d5309210d8f7bae8fa074da495e9d009d67f1b4 + f18510c2fbdfc11b8144ced4857b3d878fa70965 - + https://github.com/dotnet/aspnetcore - 7d5309210d8f7bae8fa074da495e9d009d67f1b4 + f18510c2fbdfc11b8144ced4857b3d878fa70965 - + https://github.com/dotnet/aspnetcore - 7d5309210d8f7bae8fa074da495e9d009d67f1b4 + f18510c2fbdfc11b8144ced4857b3d878fa70965 - + https://github.com/dotnet/aspnetcore - 7d5309210d8f7bae8fa074da495e9d009d67f1b4 + f18510c2fbdfc11b8144ced4857b3d878fa70965 - + https://github.com/dotnet/aspnetcore - 7d5309210d8f7bae8fa074da495e9d009d67f1b4 + f18510c2fbdfc11b8144ced4857b3d878fa70965 - + https://github.com/dotnet/aspnetcore - 7d5309210d8f7bae8fa074da495e9d009d67f1b4 + f18510c2fbdfc11b8144ced4857b3d878fa70965 - + https://github.com/dotnet/sdk - a4242bf39e7f39c999e5a699931a5bf9f7821bc5 + 3b2c023f39ebe5990b360a12b58bc7e3886e7c1c - + https://github.com/dotnet/sdk - a4242bf39e7f39c999e5a699931a5bf9f7821bc5 + 3b2c023f39ebe5990b360a12b58bc7e3886e7c1c - + https://github.com/dotnet/sdk - a4242bf39e7f39c999e5a699931a5bf9f7821bc5 + 3b2c023f39ebe5990b360a12b58bc7e3886e7c1c - + https://github.com/dotnet/sdk - a4242bf39e7f39c999e5a699931a5bf9f7821bc5 + 3b2c023f39ebe5990b360a12b58bc7e3886e7c1c - + https://github.com/dotnet/sdk - a4242bf39e7f39c999e5a699931a5bf9f7821bc5 + 3b2c023f39ebe5990b360a12b58bc7e3886e7c1c @@ -147,18 +147,18 @@ https://github.com/dotnet/winforms c0dad198e0c75e50ebefaea76a5bf42f4f0b25ba - + https://github.com/dotnet/wpf - 1b852a4e44a0f60310fe1d6eda6b5fefb2f9ef38 + 04d8cc359f518cdb16ac7ffecf23f876fded0155 - + https://github.com/dotnet/fsharp - 27efc282d3c1e3abdf8322191e09d0fe466c489e + 9881e3b215a6b0ae64b83ffacac518314ca6a19d - + https://github.com/dotnet/fsharp - 27efc282d3c1e3abdf8322191e09d0fe466c489e + 9881e3b215a6b0ae64b83ffacac518314ca6a19d @@ -171,33 +171,33 @@ 56d28849af08dc3143d019694aa92f186b89d2ac - + https://github.com/dotnet/runtime - b0118bebe385cb68f272a32ca6a5c5bb53c9b14f + 1c824d929b734db420babbc04f44a1491d8a7efb - + https://github.com/dotnet/roslyn - e465daf014a2b82e87d36eaef0942a07c2e44812 + ee03bbc8a2e5cfc86de04e51d13448cb7c494607 - + https://github.com/dotnet/roslyn - e465daf014a2b82e87d36eaef0942a07c2e44812 + ee03bbc8a2e5cfc86de04e51d13448cb7c494607 - + https://github.com/dotnet/msbuild - 195e9289b39c4e5cd5d25e9422fcc4a93f95cefa + 9cdb3615adb4115f92b390de2f258fac5f320909 - + https://github.com/dotnet/msbuild - 195e9289b39c4e5cd5d25e9422fcc4a93f95cefa + 9cdb3615adb4115f92b390de2f258fac5f320909 - + https://github.com/nuget/nuget.client - e9355040881280a661c9d8f9428d07aba1d05d97 + 252bbee32a839623dc9af267f950d21cde5e9497 diff --git a/eng/Versions.props b/eng/Versions.props index 35cccde4b..561a80f76 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -51,7 +51,7 @@ - 9.0.0-preview.4.24218.2 + 9.0.0-preview.4.24219.1 @@ -67,49 +67,49 @@ - 9.0.0-preview.4.24218.1 - 9.0.0-preview.4.24218.1 - 9.0.0-preview.4.24218.1 - 9.0.0-preview.4.24218.1 - 9.0.0-preview.4.24218.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 + 9.0.0-preview.4.24223.1 + 9.0.0-preview.4.24223.1 + 9.0.0-preview.4.24223.1 + 9.0.0-preview.4.24223.1 + 9.0.0-preview.4.24223.1 0.2.0 - 9.0.100-preview.4.24218.18 - 9.0.100-preview.4.24218.18 - 9.0.100-preview.4.24218.18 + 9.0.100-preview.4.24223.5 + 9.0.100-preview.4.24223.5 + 9.0.100-preview.4.24223.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.11.0-1.24218.2 + 4.11.0-1.24222.7 - 9.0.0-preview.4.24218.7 + 9.0.0-preview.4.24222.8 - 9.0.0-preview.4.24218.7 - 9.0.0-preview.4.24218.7 - 9.0.0-preview.4.24218.7 - 9.0.0-preview.4.24218.7 - 9.0.0-preview.4.24218.7 + 9.0.0-preview.4.24222.8 + 9.0.0-preview.4.24222.8 + 9.0.0-preview.4.24222.8 + 9.0.0-preview.4.24222.8 + 9.0.0-preview.4.24222.8 2.1.0 - 9.0.0-preview.4.24218.3 - 9.0.0-preview.4.24218.3 - 9.0.0-preview.4.24218.3 - 9.0.0-preview.4.24218.3 + 9.0.0-preview.4.24220.1 + 9.0.0-preview.4.24220.1 + 9.0.0-preview.4.24220.1 + 9.0.0-preview.4.24220.1 @@ -120,7 +120,7 @@ - 6.11.0-preview.1.27 + 6.11.0-preview.1.28 diff --git a/eng/pipelines/templates/jobs/vmr-build.yml b/eng/pipelines/templates/jobs/vmr-build.yml index 1a5e93ef6..68101af79 100644 --- a/eng/pipelines/templates/jobs/vmr-build.yml +++ b/eng/pipelines/templates/jobs/vmr-build.yml @@ -230,6 +230,13 @@ jobs: displayName: Setup Previously Source-Built SDK - ${{ if eq(parameters.targetOS, 'windows') }}: + # Node 20.x is a toolset dependency to build aspnetcore + # Keep in sync with aspnetcore: https://github.com/dotnet/aspnetcore/blob/7d5309210d8f7bae8fa074da495e9d009d67f1b4/.azure/pipelines/ci.yml#L719-L722 + - task: NodeTool@0 + displayName: Install Node 20.x + inputs: + versionSpec: 20.x + - script: | call $(sourcesPath)\build.cmd -ci -cleanWhileBuilding -prepareMachine %devArgument% /p:TargetOS=${{ parameters.targetOS }} /p:TargetArchitecture=${{ parameters.targetArchitecture }} ${{ parameters.extraProperties }} displayName: Build diff --git a/src/SourceBuild/content/eng/Version.Details.xml b/src/SourceBuild/content/eng/Version.Details.xml index b433058ab..6099c7aa2 100644 --- a/src/SourceBuild/content/eng/Version.Details.xml +++ b/src/SourceBuild/content/eng/Version.Details.xml @@ -2,9 +2,9 @@ - + https://github.com/dotnet/arcade - 689fb2d1b620a9df28c3384d9b208e3654a0f928 + 91ce5946fec9f81f15f81d20e1aab63527302410 diff --git a/src/SourceBuild/content/eng/Versions.props b/src/SourceBuild/content/eng/Versions.props index 5c3cacce4..31d914e8f 100644 --- a/src/SourceBuild/content/eng/Versions.props +++ b/src/SourceBuild/content/eng/Versions.props @@ -23,8 +23,8 @@ of a .NET major or minor release, prebuilts may be needed. When the release is mature, prebuilts are not necessary, and this property is removed from the file. --> - 9.0.100-preview.4.24179.1 - 9.0.100-preview.4.24179.1 + 9.0.100-preview.4.24223.1 + 9.0.100-preview.4.24223.1 2.0.0-beta4.24126.1 diff --git a/src/SourceBuild/content/global.json b/src/SourceBuild/content/global.json index 5ffcf53ed..36bd8350c 100644 --- a/src/SourceBuild/content/global.json +++ b/src/SourceBuild/content/global.json @@ -1,10 +1,10 @@ { "tools": { - "dotnet": "9.0.100-preview.4.24178.10" + "dotnet": "9.0.100-preview.4.24223.7" }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24177.2" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24223.3" } } diff --git a/src/SourceBuild/patches/aspnetcore/0001-Condition-RIDs-on-which-target-RIDs-are-available-wh.patch b/src/SourceBuild/patches/aspnetcore/0001-Condition-RIDs-on-which-target-RIDs-are-available-wh.patch deleted file mode 100644 index dc9f1bbb6..000000000 --- a/src/SourceBuild/patches/aspnetcore/0001-Condition-RIDs-on-which-target-RIDs-are-available-wh.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Jeremy Koritzinsky -Date: Tue, 16 Apr 2024 15:56:07 -0700 -Subject: [PATCH] Condition RIDs on which target RIDs are available when doing - a VMR build - -Backport: https://github.com/dotnet/aspnetcore/pull/55172 ---- - src/Servers/IIS/IIS/test/testassets/TestTasks/TestTasks.csproj | 1 + - src/Servers/IIS/build/testsite.props | 1 + - .../ServerComparison.TestSites/ServerComparison.TestSites.csproj | 1 + - 3 files changed, 3 insertions(+) - -diff --git a/src/Servers/IIS/IIS/test/testassets/TestTasks/TestTasks.csproj b/src/Servers/IIS/IIS/test/testassets/TestTasks/TestTasks.csproj -index f6157b9730..0e4cfec2ec 100644 ---- a/src/Servers/IIS/IIS/test/testassets/TestTasks/TestTasks.csproj -+++ b/src/Servers/IIS/IIS/test/testassets/TestTasks/TestTasks.csproj -@@ -4,6 +4,7 @@ - Exe - $(DefaultNetCoreTargetFramework) - win-x64;linux-x64;osx-x64 -+ $(TargetRuntimeIdentifier) - -