From 273f49c44f8549ecddfd13f01a21ba7b6b8a017b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 14 Feb 2024 01:56:14 +0000 Subject: [PATCH] [main] Update dependencies from dotnet/sdk (#18641) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 9.0.0-preview.2.24112.5 to 9.0.0-preview.2.24113.4 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0: from 9.0.0-preview.2.24112.5 to 9.0.0-preview.2.24113.4 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0: from 9.0.0-preview.2.24112.5 to 9.0.0-preview.2.24113.4 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.SharedFramework.x64.9.0: from 9.0.0-preview.2.24112.33 to 9.0.0-preview.2.24113.5 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Ref: from 9.0.0-preview.2.24112.33 to 9.0.0-preview.2.24113.5 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.TargetingPack.x64.9.0: from 9.0.0-preview.2.24112.33 to 9.0.0-preview.2.24113.5 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 9.0.0-preview.2.24112.33 to 9.0.0-preview.2.24113.5 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 9.0.0-preview.2.24112.33 to 9.0.0-preview.2.24113.5 (parent: Microsoft.NET.Sdk) - Microsoft.SourceBuild.Intermediate.runtime.linux-x64: from 9.0.0-preview.2.24112.33 to 9.0.0-preview.2.24113.5 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 9.0.0-preview.2.24112.25 to 9.0.0-preview.2.24113.4 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 9.0.0-preview.2.24112.25 to 9.0.0-preview.2.24113.4 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 9.0.0-preview.2.24112.25 to 9.0.0-preview.2.24113.4 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0: from 9.0.0-preview.2.24112.25 to 9.0.0-preview.2.24113.4 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 9.0.0-preview.2.24112.25 to 9.0.0-preview.2.24113.4 (parent: Microsoft.NET.Sdk) - dotnet-user-jwts: from 9.0.0-preview.2.24112.25 to 9.0.0-preview.2.24113.4 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 9.0.0-preview.2.24112.25 to 9.0.0-preview.2.24113.4 (parent: Microsoft.NET.Sdk) - Microsoft.SourceBuild.Intermediate.aspnetcore: from 9.0.0-preview.2.24112.25 to 9.0.0-preview.2.24113.4 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 9.0.0-preview.2.24112.5 to 9.0.0-preview.2.24113.4 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 9.0.0-preview.2.24112.2 to 9.0.0-preview.2.24112.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 9.0.0-preview.2.24112.5 to 9.0.0-preview.2.24113.4 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 9.0.0-preview.2.24112.2 to 9.0.0-preview.2.24112.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.FSharp.Compiler: from 12.8.300-beta.24112.4 to 12.8.300-beta.24113.3 (parent: Microsoft.NET.Sdk) - Microsoft.SourceBuild.Intermediate.fsharp: from 8.0.300-beta.24112.4 to 8.0.300-beta.24113.3 (parent: Microsoft.NET.Sdk) - Microsoft.NET.Test.Sdk: from 17.10.0-preview-24107-02 to 17.10.0-preview-24112-02 (parent: Microsoft.NET.Sdk) - Microsoft.SourceBuild.Intermediate.vstest: from 17.10.0-preview-24107-02 to 17.10.0-preview-24112-02 (parent: Microsoft.NET.Sdk) - Microsoft.NET.ILLink.Tasks: from 9.0.0-preview.2.24112.33 to 9.0.0-preview.2.24113.5 (parent: Microsoft.NET.Sdk) - Microsoft.Net.Compilers.Toolset: from 4.10.0-2.24112.4 to 4.10.0-2.24113.3 (parent: Microsoft.NET.Sdk) - Microsoft.SourceBuild.Intermediate.roslyn: from 4.10.0-2.24112.4 to 4.10.0-2.24113.3 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 9.0.0-preview.2.24112.33 to 9.0.0-preview.2.24113.5 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 9.0.0-preview.2.24112.33 to 9.0.0-preview.2.24113.5 (parent: Microsoft.NET.Sdk) - Delete obsolete format patch - Update WASI container to react to https://github.com/dotnet/runtime/commit/1a9e0cdb3b4c6140963ec3e5ef50042603a84045 - Update aspnetcore.proj --- eng/Version.Details.xml | 132 +++++++++--------- eng/Versions.props | 48 +++---- eng/pipelines/templates/stages/vmr-build.yml | 4 +- .../templates/variables/vmr-stage.yml | 4 +- .../content/repo-projects/aspnetcore.proj | 1 - ...0001-Remove-RazorCompiler-dependency.patch | 37 ----- 6 files changed, 95 insertions(+), 131 deletions(-) delete mode 100644 src/SourceBuild/patches/format/0001-Remove-RazorCompiler-dependency.patch diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 189c3f0cf..66b38318b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,41 +5,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 - 11b43f216d16e175bad44c5360e9088a1f9e97ec + 5a1d42b2a2219f560ad00e641d091339cc32f5fa - + https://github.com/dotnet/windowsdesktop - 11b43f216d16e175bad44c5360e9088a1f9e97ec + 5a1d42b2a2219f560ad00e641d091339cc32f5fa - + https://github.com/dotnet/windowsdesktop - 11b43f216d16e175bad44c5360e9088a1f9e97ec + 5a1d42b2a2219f560ad00e641d091339cc32f5fa - + https://github.com/dotnet/windowsdesktop - 11b43f216d16e175bad44c5360e9088a1f9e97ec + 5a1d42b2a2219f560ad00e641d091339cc32f5fa - + https://github.com/dotnet/runtime - 6299d3e88f85ff2d7218e9b1066db8548116a979 + 5d123f164a7a608dd655bdbdf997f1189def9445 - + https://github.com/dotnet/runtime - 6299d3e88f85ff2d7218e9b1066db8548116a979 + 5d123f164a7a608dd655bdbdf997f1189def9445 - + https://github.com/dotnet/runtime - 6299d3e88f85ff2d7218e9b1066db8548116a979 + 5d123f164a7a608dd655bdbdf997f1189def9445 - + https://github.com/dotnet/runtime - 6299d3e88f85ff2d7218e9b1066db8548116a979 + 5d123f164a7a608dd655bdbdf997f1189def9445 - + https://github.com/dotnet/runtime - 6299d3e88f85ff2d7218e9b1066db8548116a979 + 5d123f164a7a608dd655bdbdf997f1189def9445 @@ -47,70 +47,70 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 6299d3e88f85ff2d7218e9b1066db8548116a979 + 5d123f164a7a608dd655bdbdf997f1189def9445 - + https://github.com/dotnet/runtime - 6299d3e88f85ff2d7218e9b1066db8548116a979 + 5d123f164a7a608dd655bdbdf997f1189def9445 - + https://github.com/dotnet/aspnetcore - 43f49bcf6df41b567b67011abdaea242afb83158 + acb6a41ce06d0701a97c6d58ce65bd54ba6cfbaf - + https://github.com/dotnet/aspnetcore - 43f49bcf6df41b567b67011abdaea242afb83158 + acb6a41ce06d0701a97c6d58ce65bd54ba6cfbaf - + https://github.com/dotnet/aspnetcore - 43f49bcf6df41b567b67011abdaea242afb83158 + acb6a41ce06d0701a97c6d58ce65bd54ba6cfbaf - + https://github.com/dotnet/aspnetcore - 43f49bcf6df41b567b67011abdaea242afb83158 + acb6a41ce06d0701a97c6d58ce65bd54ba6cfbaf - + https://github.com/dotnet/aspnetcore - 43f49bcf6df41b567b67011abdaea242afb83158 + acb6a41ce06d0701a97c6d58ce65bd54ba6cfbaf - + https://github.com/dotnet/aspnetcore - 43f49bcf6df41b567b67011abdaea242afb83158 + acb6a41ce06d0701a97c6d58ce65bd54ba6cfbaf - + https://github.com/dotnet/aspnetcore - 43f49bcf6df41b567b67011abdaea242afb83158 + acb6a41ce06d0701a97c6d58ce65bd54ba6cfbaf - + https://github.com/dotnet/aspnetcore - 43f49bcf6df41b567b67011abdaea242afb83158 + acb6a41ce06d0701a97c6d58ce65bd54ba6cfbaf - + https://github.com/dotnet/sdk - 66284ae2df9045405d1801c882027fdbabed5c26 + c0bd12c3fa4e95a6585d19b37f6485cc3198c703 - + https://github.com/dotnet/sdk - 66284ae2df9045405d1801c882027fdbabed5c26 + c0bd12c3fa4e95a6585d19b37f6485cc3198c703 - + https://github.com/dotnet/sdk - 66284ae2df9045405d1801c882027fdbabed5c26 + c0bd12c3fa4e95a6585d19b37f6485cc3198c703 - + https://github.com/dotnet/sdk - 66284ae2df9045405d1801c882027fdbabed5c26 + c0bd12c3fa4e95a6585d19b37f6485cc3198c703 - + https://github.com/dotnet/sdk - 66284ae2df9045405d1801c882027fdbabed5c26 + c0bd12c3fa4e95a6585d19b37f6485cc3198c703 @@ -144,46 +144,46 @@ - + https://github.com/dotnet/winforms - dd56dedb821c890390992c40ad50bcde35a6dd0f + 91f648b25dc18e9b7527714118a9e8f7e2b7075a - + https://github.com/dotnet/wpf - db12339ccd43037d5e1229fb5c84b87f13c86de4 + 73e2313d6c6c861e64fc990d4f755e7aee3e8bba - + https://github.com/dotnet/fsharp - 9de468a9bcd1dd5f3791639e0be2227aee0696a7 + 9d413d79d4f820c3e393572b0715255558250733 - + https://github.com/dotnet/fsharp - 9de468a9bcd1dd5f3791639e0be2227aee0696a7 + 9d413d79d4f820c3e393572b0715255558250733 - + https://github.com/microsoft/vstest - f21d0dae0b91fe59e4afa92166bd721ddd2f0036 + 5eed35d4a9a2e1b688eb86c5e4171e370a561b2a - + https://github.com/microsoft/vstest - f21d0dae0b91fe59e4afa92166bd721ddd2f0036 + 5eed35d4a9a2e1b688eb86c5e4171e370a561b2a - + https://github.com/dotnet/runtime - 6299d3e88f85ff2d7218e9b1066db8548116a979 + 5d123f164a7a608dd655bdbdf997f1189def9445 - + https://github.com/dotnet/roslyn - 76ca39e7b05779d9616fdc5ef07bacfdb57a4877 + e4b5e0ce26b17eb25293185fc54f241cc6a3e023 - + https://github.com/dotnet/roslyn - 76ca39e7b05779d9616fdc5ef07bacfdb57a4877 + e4b5e0ce26b17eb25293185fc54f241cc6a3e023 diff --git a/eng/Versions.props b/eng/Versions.props index bdea1dc62..ba87b4f4b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,11 +48,11 @@ - 9.0.0-preview.2.24112.2 + 9.0.0-preview.2.24112.7 - 9.0.0-preview.2.24112.2 + 9.0.0-preview.2.24112.4 @@ -73,49 +73,49 @@ - 9.0.0-preview.2.24112.25 - 9.0.0-preview.2.24112.25 - 9.0.0-preview.2.24112.25 - 9.0.0-preview.2.24112.25 - 9.0.0-preview.2.24112.25 - 9.0.0-preview.2.24112.25 - 9.0.0-preview.2.24112.25 + 9.0.0-preview.2.24113.4 + 9.0.0-preview.2.24113.4 + 9.0.0-preview.2.24113.4 + 9.0.0-preview.2.24113.4 + 9.0.0-preview.2.24113.4 + 9.0.0-preview.2.24113.4 + 9.0.0-preview.2.24113.4 0.2.0 - 9.0.100-preview.2.24113.3 - 9.0.100-preview.2.24113.3 - 9.0.100-preview.2.24113.3 + 9.0.100-preview.2.24113.24 + 9.0.100-preview.2.24113.24 + 9.0.100-preview.2.24113.24 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.10.0-2.24112.4 + 4.10.0-2.24113.3 - 9.0.0-preview.2.24112.33 + 9.0.0-preview.2.24113.5 - 9.0.0-preview.2.24112.33 - 9.0.0-preview.2.24112.33 - 9.0.0-preview.2.24112.33 - 9.0.0-preview.2.24112.33 - 9.0.0-preview.2.24112.33 + 9.0.0-preview.2.24113.5 + 9.0.0-preview.2.24113.5 + 9.0.0-preview.2.24113.5 + 9.0.0-preview.2.24113.5 + 9.0.0-preview.2.24113.5 2.1.0 - 9.0.0-preview.2.24112.5 - 9.0.0-preview.2.24112.5 - 9.0.0-preview.2.24112.5 - 9.0.0-preview.2.24112.5 + 9.0.0-preview.2.24113.4 + 9.0.0-preview.2.24113.4 + 9.0.0-preview.2.24113.4 + 9.0.0-preview.2.24113.4 @@ -245,7 +245,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.10.0-preview-24107-02 + 17.10.0-preview-24112-02 9.0.0-alpha.1.24058.10 9.0.0-preview.24057.2 diff --git a/eng/pipelines/templates/stages/vmr-build.yml b/eng/pipelines/templates/stages/vmr-build.yml index 73267ca85..717b2dd95 100644 --- a/eng/pipelines/templates/stages/vmr-build.yml +++ b/eng/pipelines/templates/stages/vmr-build.yml @@ -368,7 +368,7 @@ stages: pool: name: ${{ variables.defaultPoolName }} demands: ${{ variables.defaultPoolDemandsLinux }} - container: ${{ variables.wasmCrossContainer }} + container: ${{ variables.browserCrossContainer }} crossRootFs: '/crossrootfs/x64' targetOS: browser targetArchitecture: wasm @@ -540,7 +540,7 @@ stages: pool: name: ${{ variables.defaultPoolName }} demands: ${{ variables.defaultPoolDemandsLinux }} - container: ${{ variables.wasmCrossContainer }} + container: ${{ variables.wasiCrossContainer }} crossRootFs: '/crossrootfs/x64' targetOS: wasi targetArchitecture: wasm diff --git a/eng/pipelines/templates/variables/vmr-stage.yml b/eng/pipelines/templates/variables/vmr-stage.yml index 8355beabb..bd0e8c7aa 100644 --- a/eng/pipelines/templates/variables/vmr-stage.yml +++ b/eng/pipelines/templates/variables/vmr-stage.yml @@ -28,8 +28,10 @@ variables: value: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm64 - name: androidCrossContainer value: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-android-amd64 -- name: wasmCrossContainer +- name: browserCrossContainer value: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-webassembly-20230917141449-2aaa02c +- name: wasiCrossContainer + value: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-webassembly - ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: defaultPoolName diff --git a/src/SourceBuild/content/repo-projects/aspnetcore.proj b/src/SourceBuild/content/repo-projects/aspnetcore.proj index be3d4294c..59bd8e296 100644 --- a/src/SourceBuild/content/repo-projects/aspnetcore.proj +++ b/src/SourceBuild/content/repo-projects/aspnetcore.proj @@ -11,7 +11,6 @@ $(BuildArgs) $(FlagParameterPrefix)arch $(TargetArchitecture) $(BuildArgs) $(FlagParameterPrefix)no-build-repo-tasks - $(BuildArgs) $(FlagParameterPrefix)no-build-nodejs true diff --git a/src/SourceBuild/patches/format/0001-Remove-RazorCompiler-dependency.patch b/src/SourceBuild/patches/format/0001-Remove-RazorCompiler-dependency.patch deleted file mode 100644 index 592a69a4a..000000000 --- a/src/SourceBuild/patches/format/0001-Remove-RazorCompiler-dependency.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Matt Thalman -Date: Fri, 19 Jan 2024 08:55:05 -0600 -Subject: [PATCH] Remove RazorCompiler dependency - -Backport: https://github.com/dotnet/format/issues/2075 ---- - Directory.Packages.props | 1 - - src/dotnet-format.csproj | 3 --- - 2 files changed, 4 deletions(-) - -diff --git a/Directory.Packages.props b/Directory.Packages.props -index 8da27dea..1b7df1ce 100644 ---- a/Directory.Packages.props -+++ b/Directory.Packages.props -@@ -37,7 +37,6 @@ - - - -- - - - -diff --git a/src/dotnet-format.csproj b/src/dotnet-format.csproj -index a07a552b..14323f64 100644 ---- a/src/dotnet-format.csproj -+++ b/src/dotnet-format.csproj -@@ -35,9 +35,6 @@ - - - -- -- -- - - -