From c860d4ea43fead7d98a0ede5d464188ed14b0196 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 11 Nov 2022 17:03:35 +0000 Subject: [PATCH] [main] Update dependencies from dotnet/sdk (#14951) * Update dependencies from https://github.com/dotnet/sdk build 20221109.13 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100 Dependency coherency updates NuGet.Build.Tasks From Version 6.5.0-preview.2.67 -> To Version 6.5.0-preview.2.69 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20221109.14 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.NET.ILLink.Tasks,NuGet.Build.Tasks From Version 8.0.0-alpha.1.22557.12 -> To Version 8.0.0-alpha.1.22559.1 (parent: Microsoft.NET.Sdk * Remove backported source-build runtime patch * Update dependencies from https://github.com/dotnet/sdk build 20221109.26 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks From Version 8.0.0-alpha.1.22557.12 -> To Version 8.0.0-alpha.1.22559.1 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20221109.29 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks From Version 8.0.0-alpha.1.22557.12 -> To Version 8.0.0-alpha.1.22559.1 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20221110.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 8.0.0-alpha.1.22557.12 -> To Version 8.0.0-alpha.1.22559.1 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20221110.6 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 8.0.0-alpha.1.22557.12 -> To Version 8.0.0-alpha.1.22559.2 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20221110.14 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 8.0.0-alpha.1.22557.12 -> To Version 8.0.0-alpha.1.22559.2 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20221110.15 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100 -> To Version 8.0.100 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 8.0.0-alpha.1.22557.12 -> To Version 8.0.0-alpha.1.22559.2 (parent: Microsoft.NET.Sdk * Bump DarcLib Co-authored-by: dotnet-maestro[bot] Co-authored-by: MichaelSimons Co-authored-by: Premek Vysoky --- .config/dotnet-tools.json | 2 +- NuGet.config | 2 +- eng/Version.Details.xml | 78 +++++++++---------- eng/Versions.props | 22 +++--- ...ObjWriter-dependency-in-source-build.patch | 40 ---------- 5 files changed, 52 insertions(+), 92 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/runtime/0002-Remove-llvm-ObjWriter-dependency-in-source-build.patch diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index f6136c69a..26b81283a 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.22559.2", + "version": "1.1.0-beta.22561.2", "commands": [ "darc" ] diff --git a/NuGet.config b/NuGet.config index da731f31f..452d38c81 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7e545e184..e438323f7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop 9162860562ca3b6a02d2d5683c12a668058727d8 - + https://github.com/dotnet/runtime - af841c8b33cecc92d74222298f1e45bf7bf3d90a + dd7fdb723d91c2c6cb7efc3d95f9d95ee86d48c8 - + https://github.com/dotnet/runtime - af841c8b33cecc92d74222298f1e45bf7bf3d90a + dd7fdb723d91c2c6cb7efc3d95f9d95ee86d48c8 - + https://github.com/dotnet/runtime - af841c8b33cecc92d74222298f1e45bf7bf3d90a + dd7fdb723d91c2c6cb7efc3d95f9d95ee86d48c8 - + https://github.com/dotnet/runtime - af841c8b33cecc92d74222298f1e45bf7bf3d90a + dd7fdb723d91c2c6cb7efc3d95f9d95ee86d48c8 - + https://github.com/dotnet/runtime - af841c8b33cecc92d74222298f1e45bf7bf3d90a + dd7fdb723d91c2c6cb7efc3d95f9d95ee86d48c8 - + https://github.com/dotnet/runtime - af841c8b33cecc92d74222298f1e45bf7bf3d90a + dd7fdb723d91c2c6cb7efc3d95f9d95ee86d48c8 @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - af841c8b33cecc92d74222298f1e45bf7bf3d90a + dd7fdb723d91c2c6cb7efc3d95f9d95ee86d48c8 https://github.com/dotnet/aspnetcore @@ -104,20 +104,20 @@ https://github.com/dotnet/sdk - 4bd9b67d81fbf6d65012ef08c9d8cf2a27953057 + 842bd8ac7c6fc8303ff8864515790113e1115991 - + https://github.com/dotnet/sdk - 4bd9b67d81fbf6d65012ef08c9d8cf2a27953057 + 842bd8ac7c6fc8303ff8864515790113e1115991 - + https://github.com/dotnet/sdk - 4bd9b67d81fbf6d65012ef08c9d8cf2a27953057 + 842bd8ac7c6fc8303ff8864515790113e1115991 - + https://github.com/dotnet/sdk - 4bd9b67d81fbf6d65012ef08c9d8cf2a27953057 + 842bd8ac7c6fc8303ff8864515790113e1115991 @@ -128,39 +128,39 @@ https://github.com/dotnet/wpf 959913ec4f81cc388928fad0c95840bf3ee4962b - + https://github.com/dotnet/fsharp - a6a64706c78963cb033fd230f36518d3e773b725 + 126877797a797eeb17ddfb8d18904c18eca8aa5d - + https://github.com/dotnet/fsharp - a6a64706c78963cb033fd230f36518d3e773b725 + 126877797a797eeb17ddfb8d18904c18eca8aa5d - + https://github.com/microsoft/vstest - 02296a2873652bc5911ae4b58d74f9faae03917d + 4e8b9437a0a5a045f26615a1fbd9d1fc50f6d86f - + https://github.com/dotnet/linker - dc5e60f5f2becf0b462d37ad918443126e80b49b + 9c993bf401377209cd7b4e84b60deab5e4f421a2 linker - + https://github.com/dotnet/roslyn - c9a6d5cf04904ebd2b1aaab0adb33df16c8e76a6 + 09bf1ae4c8671b48bbf4e28f2a2d926de037d068 - + https://github.com/dotnet/msbuild - 3bcada934edfa09e5f68222411e3efeda407985c + 15b127d2445d6b68429f1c31d9ff98fe4e1e728c - + https://github.com/nuget/nuget.client - 6038f769411b98f4efdb10a0924986eae2583618 + a8e878fbc51600caf01d62f0deed5481af7f8aff @@ -205,13 +205,13 @@ https://github.com/dotnet/arcade 80b6be47e1425ea90c5febffac119250043a0c92 - + https://github.com/dotnet/arcade-services - 5f08d3d04702feaa49acd692aa3a169512446ee9 + e1c11c90d26581339cca9684399250101cbbc3bb - + https://github.com/dotnet/arcade-services - 5f08d3d04702feaa49acd692aa3a169512446ee9 + e1c11c90d26581339cca9684399250101cbbc3bb https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 7a4d0ba74..677a44f61 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -30,7 +30,7 @@ - 1.1.0-beta.22559.2 + 1.1.0-beta.22561.2 @@ -68,24 +68,24 @@ 8.0.100 - 8.0.100-alpha.1.22558.25 - 8.0.100-alpha.1.22558.25 + 8.0.100-alpha.1.22560.15 + 8.0.100-alpha.1.22560.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 8.0.0-alpha.1.22557.12 + 8.0.0-alpha.1.22559.2 - 8.0.0-alpha.1.22557.12 - 8.0.0-alpha.1.22557.12 - 8.0.0-alpha.1.22557.12 - 8.0.0-alpha.1.22557.12 - 8.0.0-alpha.1.22557.12 - 8.0.0-alpha.1.22557.12 + 8.0.0-alpha.1.22559.2 + 8.0.0-alpha.1.22559.2 + 8.0.0-alpha.1.22559.2 + 8.0.0-alpha.1.22559.2 + 8.0.0-alpha.1.22559.2 + 8.0.0-alpha.1.22559.2 2.1.0 @@ -186,7 +186,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.5.0-preview-20221107-06 + 17.5.0-preview-20221109-01 7.0.0-rc.1.22426.10 diff --git a/src/SourceBuild/tarball/patches/runtime/0002-Remove-llvm-ObjWriter-dependency-in-source-build.patch b/src/SourceBuild/tarball/patches/runtime/0002-Remove-llvm-ObjWriter-dependency-in-source-build.patch deleted file mode 100644 index 02e49eec9..000000000 --- a/src/SourceBuild/tarball/patches/runtime/0002-Remove-llvm-ObjWriter-dependency-in-source-build.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Chris Rummel -Date: Mon, 26 Sep 2022 14:25:33 -0500 -Subject: Remove LLVM ObjWriter dependency in source-build - -Backport PR: https://github.com/dotnet/runtime/pull/76206. - ---- - src/coreclr/tools/aot/ILCompiler/ILCompiler.props | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/src/coreclr/tools/aot/ILCompiler/ILCompiler.props b/src/coreclr/tools/aot/ILCompiler/ILCompiler.props -index 8c4fce523906e..4fd1db03e8a48 100644 ---- a/src/coreclr/tools/aot/ILCompiler/ILCompiler.props -+++ b/src/coreclr/tools/aot/ILCompiler/ILCompiler.props -@@ -48,12 +48,14 @@ - - - true -+ -+ true - - - - - -- -+ - $(ObjWriterVersion) - - -@@ -62,7 +64,7 @@ - $(NetStandardLibraryVersion) - - -- -+ - PreserveNewest - false - false