From 4106448ffae0ac01c5cdec31608b7904aaf1ef05 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 15 Mar 2024 13:05:34 -0700 Subject: [PATCH] [main] Update dependencies from dotnet/sdk (#19065) Co-authored-by: dotnet-maestro[bot] Co-authored-by: Matt Mitchell (.NET) Co-authored-by: Viktor Hofer --- eng/Version.Details.xml | 140 +++++++++--------- eng/Versions.props | 48 +++--- .../repo-projects/Directory.Build.targets | 5 +- .../0001-Enable-publishing-in-VMR.patch | 42 ------ .../sdk/0001-Enable-publishing-in-VMR.patch | 83 ----------- 5 files changed, 98 insertions(+), 220 deletions(-) delete mode 100644 src/SourceBuild/patches/fsharp/0001-Enable-publishing-in-VMR.patch delete mode 100644 src/SourceBuild/patches/sdk/0001-Enable-publishing-in-VMR.patch diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 68c59dc7c..5f3e126e5 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 - afac3334f4087044a6ac73450bc79c281fe8e833 + ce44ae8e4ccfe04ff6d6447370c6038732d11439 - + https://github.com/dotnet/windowsdesktop - afac3334f4087044a6ac73450bc79c281fe8e833 + ce44ae8e4ccfe04ff6d6447370c6038732d11439 - + https://github.com/dotnet/windowsdesktop - afac3334f4087044a6ac73450bc79c281fe8e833 + ce44ae8e4ccfe04ff6d6447370c6038732d11439 - + https://github.com/dotnet/windowsdesktop - afac3334f4087044a6ac73450bc79c281fe8e833 + ce44ae8e4ccfe04ff6d6447370c6038732d11439 - + https://github.com/dotnet/runtime - e4fceb3ae5598ae3b1e0941c43d6108983e1c048 + 596a1f7b6429fc06cf71465238cb349cab4edc35 - + https://github.com/dotnet/runtime - e4fceb3ae5598ae3b1e0941c43d6108983e1c048 + 596a1f7b6429fc06cf71465238cb349cab4edc35 - + https://github.com/dotnet/runtime - e4fceb3ae5598ae3b1e0941c43d6108983e1c048 + 596a1f7b6429fc06cf71465238cb349cab4edc35 - + https://github.com/dotnet/runtime - e4fceb3ae5598ae3b1e0941c43d6108983e1c048 + 596a1f7b6429fc06cf71465238cb349cab4edc35 - + https://github.com/dotnet/runtime - e4fceb3ae5598ae3b1e0941c43d6108983e1c048 + 596a1f7b6429fc06cf71465238cb349cab4edc35 @@ -47,70 +47,70 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - e4fceb3ae5598ae3b1e0941c43d6108983e1c048 + 596a1f7b6429fc06cf71465238cb349cab4edc35 - + https://github.com/dotnet/runtime - e4fceb3ae5598ae3b1e0941c43d6108983e1c048 + 596a1f7b6429fc06cf71465238cb349cab4edc35 - + https://github.com/dotnet/aspnetcore - 702ba39ace967037a3f726765732e3e63f80907e + 268a2dfc29b33e3fdb73cbac6eb198c05314d77e - + https://github.com/dotnet/aspnetcore - 702ba39ace967037a3f726765732e3e63f80907e + 268a2dfc29b33e3fdb73cbac6eb198c05314d77e - + https://github.com/dotnet/aspnetcore - 702ba39ace967037a3f726765732e3e63f80907e + 268a2dfc29b33e3fdb73cbac6eb198c05314d77e - + https://github.com/dotnet/aspnetcore - 702ba39ace967037a3f726765732e3e63f80907e + 268a2dfc29b33e3fdb73cbac6eb198c05314d77e - + https://github.com/dotnet/aspnetcore - 702ba39ace967037a3f726765732e3e63f80907e + 268a2dfc29b33e3fdb73cbac6eb198c05314d77e - + https://github.com/dotnet/aspnetcore - 702ba39ace967037a3f726765732e3e63f80907e + 268a2dfc29b33e3fdb73cbac6eb198c05314d77e - + https://github.com/dotnet/aspnetcore - 702ba39ace967037a3f726765732e3e63f80907e + 268a2dfc29b33e3fdb73cbac6eb198c05314d77e - + https://github.com/dotnet/aspnetcore - 702ba39ace967037a3f726765732e3e63f80907e + 268a2dfc29b33e3fdb73cbac6eb198c05314d77e - + https://github.com/dotnet/sdk - df3dbf6df434b0f11dcaff545d16f5957647633c + d6d51df25f85dfee1e04752ac8ac104e38d2667f - + https://github.com/dotnet/sdk - df3dbf6df434b0f11dcaff545d16f5957647633c + d6d51df25f85dfee1e04752ac8ac104e38d2667f - + https://github.com/dotnet/sdk - df3dbf6df434b0f11dcaff545d16f5957647633c + d6d51df25f85dfee1e04752ac8ac104e38d2667f - + https://github.com/dotnet/sdk - df3dbf6df434b0f11dcaff545d16f5957647633c + d6d51df25f85dfee1e04752ac8ac104e38d2667f - + https://github.com/dotnet/sdk - df3dbf6df434b0f11dcaff545d16f5957647633c + d6d51df25f85dfee1e04752ac8ac104e38d2667f @@ -144,56 +144,56 @@ - + https://github.com/dotnet/winforms - a255995a9062ea71cea983787cc1201e0b44466a + ebb882931caa199ae9f797b341cebbdcee3be2d3 - + https://github.com/dotnet/wpf - 3e014e541aaa580cfa0e7e01a4201757cf36a968 + 99172edf1f51a488d63119671dae80203e569a6f - + https://github.com/dotnet/fsharp - 212eaf7fac2d837c51dc49e477a599ebea68338b + 2c03643199368f07a3326709fc68abcbfc482a06 - + https://github.com/dotnet/fsharp - 212eaf7fac2d837c51dc49e477a599ebea68338b + 2c03643199368f07a3326709fc68abcbfc482a06 - + https://github.com/microsoft/vstest - 316167369cea59e0ad6ece2a39d94a3a6d49cf12 + c609e2c022b0087b227436a4debf45525eed00e9 - + https://github.com/microsoft/vstest - 316167369cea59e0ad6ece2a39d94a3a6d49cf12 + c609e2c022b0087b227436a4debf45525eed00e9 - + https://github.com/dotnet/runtime - e4fceb3ae5598ae3b1e0941c43d6108983e1c048 + 596a1f7b6429fc06cf71465238cb349cab4edc35 - + https://github.com/dotnet/roslyn - 629715c09402f5e741da2faa03cc4b56f74d3c8d + 711e122c86db37658d2924f2499c775ce6007b68 - + https://github.com/dotnet/roslyn - 629715c09402f5e741da2faa03cc4b56f74d3c8d + 711e122c86db37658d2924f2499c775ce6007b68 - + https://github.com/dotnet/msbuild - 0326fd7c9e131c4c26bac3c0f72a43ef9fd2812c + 0764e8979bd4e98c85d0ef9ef8220a8b52bfe4b3 - + https://github.com/dotnet/msbuild - 0326fd7c9e131c4c26bac3c0f72a43ef9fd2812c + 0764e8979bd4e98c85d0ef9ef8220a8b52bfe4b3 diff --git a/eng/Versions.props b/eng/Versions.props index 71228a9f9..6ba534d9d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,11 +47,11 @@ - 9.0.0-preview.3.24161.7 + 9.0.0-preview.3.24163.1 - 9.0.0-preview.3.24162.1 + 9.0.0-preview.3.24163.2 @@ -72,49 +72,49 @@ - 9.0.0-preview.3.24162.20 - 9.0.0-preview.3.24162.20 - 9.0.0-preview.3.24162.20 - 9.0.0-preview.3.24162.20 - 9.0.0-preview.3.24162.20 - 9.0.0-preview.3.24162.20 - 9.0.0-preview.3.24162.20 + 9.0.0-preview.3.24163.1 + 9.0.0-preview.3.24163.1 + 9.0.0-preview.3.24163.1 + 9.0.0-preview.3.24163.1 + 9.0.0-preview.3.24163.1 + 9.0.0-preview.3.24163.1 + 9.0.0-preview.3.24163.1 0.2.0 - 9.0.100-preview.3.24163.4 - 9.0.100-preview.3.24163.4 - 9.0.100-preview.3.24163.4 + 9.0.100-preview.3.24165.9 + 9.0.100-preview.3.24165.9 + 9.0.100-preview.3.24165.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.10.0-3.24162.10 + 4.10.0-3.24164.3 - 9.0.0-preview.3.24162.24 + 9.0.0-preview.3.24162.31 - 9.0.0-preview.3.24162.24 - 9.0.0-preview.3.24162.24 - 9.0.0-preview.3.24162.24 - 9.0.0-preview.3.24162.24 - 9.0.0-preview.3.24162.24 + 9.0.0-preview.3.24162.31 + 9.0.0-preview.3.24162.31 + 9.0.0-preview.3.24162.31 + 9.0.0-preview.3.24162.31 + 9.0.0-preview.3.24162.31 2.1.0 - 9.0.0-preview.3.24162.12 - 9.0.0-preview.3.24162.12 - 9.0.0-preview.3.24162.12 - 9.0.0-preview.3.24162.12 + 9.0.0-preview.3.24163.6 + 9.0.0-preview.3.24163.6 + 9.0.0-preview.3.24163.6 + 9.0.0-preview.3.24163.6 @@ -245,7 +245,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.10.0-preview-24158-06 + 17.10.0-preview-24163-01 9.0.0-alpha.1.24058.10 9.0.0-preview.24057.2 diff --git a/src/SourceBuild/content/repo-projects/Directory.Build.targets b/src/SourceBuild/content/repo-projects/Directory.Build.targets index 7431dc499..a846ed6f7 100644 --- a/src/SourceBuild/content/repo-projects/Directory.Build.targets +++ b/src/SourceBuild/content/repo-projects/Directory.Build.targets @@ -519,8 +519,11 @@ These source generators are written incorrectly (a source generator should never do IO itself), but the required features to read in binary files as input to a source generator don't exist. To work around these source generators, shut down the compiler server so we can delete the obj directories. + Don't fail the build when shutdown returns a failure. --> - + $([MSBuild]::NormalizeDirectory('$(ProjectDirectory)', 'artifacts', 'buildLogs')) diff --git a/src/SourceBuild/patches/fsharp/0001-Enable-publishing-in-VMR.patch b/src/SourceBuild/patches/fsharp/0001-Enable-publishing-in-VMR.patch deleted file mode 100644 index ec363d7c4..000000000 --- a/src/SourceBuild/patches/fsharp/0001-Enable-publishing-in-VMR.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Nikola Milosavljevic -Date: Thu, 7 Mar 2024 21:41:56 +0000 -Subject: [PATCH] Enable publishing in VMR - -Backport: https://github.com/dotnet/fsharp/pull/16838 ---- - eng/Publishing.props | 22 ++++++++++++++++++++++ - 1 file changed, 22 insertions(+) - -diff --git a/eng/Publishing.props b/eng/Publishing.props -index 18483e92a..90a2b9cbf 100644 ---- a/eng/Publishing.props -+++ b/eng/Publishing.props -@@ -1,5 +1,27 @@ - - - 3 -+ $(PublishDependsOnTargets);_PublishPackages - -+ -+ -+ <_PackagesToPublish Remove="@(_PackagesToPublish)" /> -+ <_PackagesToPublish Include="$(ArtifactsPackagesDir)**\*.nupkg" UploadPathSegment="Runtime" Condition="'$(DotNetBuildRepo)' == 'true'" /> -+ -+ -+ -+ -+ -+ -+ -+ -+ true -+ -+ -+ -+ - diff --git a/src/SourceBuild/patches/sdk/0001-Enable-publishing-in-VMR.patch b/src/SourceBuild/patches/sdk/0001-Enable-publishing-in-VMR.patch deleted file mode 100644 index 151924651..000000000 --- a/src/SourceBuild/patches/sdk/0001-Enable-publishing-in-VMR.patch +++ /dev/null @@ -1,83 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Nikola Milosavljevic -Date: Tue, 12 Mar 2024 22:54:09 +0000 -Subject: [PATCH] Enable publishing in VMR - -Backport: https://github.com/dotnet/sdk/pull/39311 ---- - eng/Publishing.props | 37 ++++++++++++++++++++++++++++++++++--- - 1 file changed, 34 insertions(+), 3 deletions(-) - -diff --git a/eng/Publishing.props b/eng/Publishing.props -index 0e6e2ec2fb..e95cf5b80b 100644 ---- a/eng/Publishing.props -+++ b/eng/Publishing.props -@@ -15,7 +15,7 @@ - $(OS)-$(PlatformName)-SdkAssets.xml - $(ArtifactsLogDir)AssetManifest\$(SdkAssetManifestFileName) - -- $(ArtifactsDir)\..\AssetsTmpDir\$([System.Guid]::NewGuid()) -+ $(ArtifactsDir)\AssetsTmpDir\$([System.Guid]::NewGuid()) - - - - -@@ -98,11 +98,15 @@ - false - true - -- - - - -+ - - -+ -+ -