From 027bf2591901da67ff8926821b97e8bdd01ed955 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 19 Oct 2022 21:45:05 +0000 Subject: [PATCH] [main] Update dependencies from dotnet/sdk (#14787) [main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 8.0.0-alpha.1.22515.1 to 8.0.0-alpha.1.22516.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0: from 8.0.0-alpha.1.22515.1 to 8.0.0-alpha.1.22516.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0: from 8.0.0-alpha.1.22515.1 to 8.0.0-alpha.1.22516.1 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 8.0.0-alpha.1.22517.13 to 8.0.0-alpha.1.22519.2 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 8.0.0-alpha.1.22517.13 to 8.0.0-alpha.1.22519.2 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 8.0.0-alpha.1.22517.13 to 8.0.0-alpha.1.22519.2 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0: from 8.0.0-alpha.1.22517.13 to 8.0.0-alpha.1.22519.2 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 8.0.0-alpha.1.22517.13 to 8.0.0-alpha.1.22519.2 (parent: Microsoft.NET.Sdk) - dotnet-user-jwts: from 8.0.0-alpha.1.22517.13 to 8.0.0-alpha.1.22519.2 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 8.0.0-alpha.1.22517.13 to 8.0.0-alpha.1.22519.2 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 8.0.0-alpha.1.22515.1 to 8.0.0-alpha.1.22516.1 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 8.0.0-alpha.1.22511.1 to 8.0.0-alpha.1.22511.12 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 8.0.0-alpha.1.22515.1 to 8.0.0-alpha.1.22516.1 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 8.0.0-alpha.1.22511.2 to 8.0.0-alpha.1.22515.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.NET.Test.Sdk: from 17.5.0-preview-20221013-06 to 17.5.0-preview-20221018-02 (parent: Microsoft.NET.Sdk) - Microsoft.NET.ILLink.Tasks: from 7.0.100-1.22514.1 to 7.0.100-1.22518.2 (parent: Microsoft.NET.Sdk) - Microsoft.Build: from 17.5.0-preview-22513-03 to 17.5.0-preview-22517-05 (parent: Microsoft.NET.Sdk) - remove backported SDK patch --- NuGet.config | 5 ++ eng/Version.Details.xml | 80 +++++++++---------- eng/Versions.props | 34 ++++---- ...02-Look-for-msbuild-net7.0-artifacts.patch | 24 ------ 4 files changed, 62 insertions(+), 81 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/sdk/0002-Look-for-msbuild-net7.0-artifacts.patch diff --git a/NuGet.config b/NuGet.config index d9926d9b0..b4f3441ac 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,6 +5,11 @@ + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index eceb5082c..250655075 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://github.com/dotnet/windowsdesktop - 78b04e9e0cd2250d78ef4937fc31c66db51aea73 + c2f71d9552f8c1cf8e6693abb5b7bb2386edc766 - + https://github.com/dotnet/windowsdesktop - 78b04e9e0cd2250d78ef4937fc31c66db51aea73 + c2f71d9552f8c1cf8e6693abb5b7bb2386edc766 - + https://github.com/dotnet/windowsdesktop - 78b04e9e0cd2250d78ef4937fc31c66db51aea73 + c2f71d9552f8c1cf8e6693abb5b7bb2386edc766 - + https://github.com/dotnet/windowsdesktop - 78b04e9e0cd2250d78ef4937fc31c66db51aea73 + c2f71d9552f8c1cf8e6693abb5b7bb2386edc766 https://github.com/dotnet/llvm-project @@ -57,34 +57,34 @@ https://github.com/dotnet/runtime d337cba786fa105d1b97ebe5e2f7f89ff0361627 - + https://github.com/dotnet/aspnetcore - 274c32e63a9df1979175c4e7c9adffdabc182e96 + 3c36e1643045d8c7baebece79ccd901321dfe5f2 - + https://github.com/dotnet/aspnetcore - 274c32e63a9df1979175c4e7c9adffdabc182e96 + 3c36e1643045d8c7baebece79ccd901321dfe5f2 - + https://github.com/dotnet/aspnetcore - 274c32e63a9df1979175c4e7c9adffdabc182e96 + 3c36e1643045d8c7baebece79ccd901321dfe5f2 - + https://github.com/dotnet/aspnetcore - 274c32e63a9df1979175c4e7c9adffdabc182e96 + 3c36e1643045d8c7baebece79ccd901321dfe5f2 - + https://github.com/dotnet/aspnetcore - 274c32e63a9df1979175c4e7c9adffdabc182e96 + 3c36e1643045d8c7baebece79ccd901321dfe5f2 - + https://github.com/dotnet/aspnetcore - 274c32e63a9df1979175c4e7c9adffdabc182e96 + 3c36e1643045d8c7baebece79ccd901321dfe5f2 - + https://github.com/dotnet/aspnetcore - 274c32e63a9df1979175c4e7c9adffdabc182e96 + 3c36e1643045d8c7baebece79ccd901321dfe5f2 https://github.com/dotnet/test-templates @@ -103,31 +103,31 @@ aaaa0c1826f97a9dfcc67e94136bf01010b55f23 - + https://github.com/dotnet/sdk - a71825ca661aa1f40c9fe5c4f3105cd8bcc2d4ce + 8f3c8141edb4f936e650ad7677d8ba08e89fd898 - + https://github.com/dotnet/sdk - a71825ca661aa1f40c9fe5c4f3105cd8bcc2d4ce + 8f3c8141edb4f936e650ad7677d8ba08e89fd898 - + https://github.com/dotnet/sdk - a71825ca661aa1f40c9fe5c4f3105cd8bcc2d4ce + 8f3c8141edb4f936e650ad7677d8ba08e89fd898 - + https://github.com/dotnet/sdk - a71825ca661aa1f40c9fe5c4f3105cd8bcc2d4ce + 8f3c8141edb4f936e650ad7677d8ba08e89fd898 - + https://github.com/dotnet/winforms - f628ca4bfcf11838922c705ee7f4a535ce5e65ec + 3fd9db1697827d9b4169fb65910df32f8824cef9 - + https://github.com/dotnet/wpf - bcb8b70db6d2209fda94e03967b106b7c8abd0b6 + dd467046db36ccb0a38989d58be8ff246e2b38d6 https://github.com/dotnet/fsharp @@ -138,14 +138,14 @@ 664588e64eff5db2a2fcb44b8dbddfb0ce4bbbf1 - + https://github.com/microsoft/vstest - 6defc0d4968a73551fac9a947693d2e9a556bb97 + bda34b1793ef6ddcd186b7088a6413692efb215e - + https://github.com/dotnet/linker - 3ebf0133b590e4be9f8ffb14f5c34fc56cce958d + 146197790e7f155beadaeab6b5cc0ac9e5108998 linker @@ -154,9 +154,9 @@ a9c49e8b8633005d2d03516693950037a9cf7cc7 - + https://github.com/dotnet/msbuild - b3bd0870cd7a5e3b570cc44bd9fa3624c3dd8312 + ef7b9a5534e83ae3b75cc30e31c1a6db9d0ed0a6 diff --git a/eng/Versions.props b/eng/Versions.props index 18bd02a1f..d34a190bb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -34,11 +34,11 @@ - 8.0.0-alpha.1.22511.1 + 8.0.0-alpha.1.22511.12 - 8.0.0-alpha.1.22511.2 + 8.0.0-alpha.1.22515.1 @@ -53,22 +53,22 @@ - 8.0.0-alpha.1.22517.13 - 8.0.0-alpha.1.22517.13 - 8.0.0-alpha.1.22517.13 - 8.0.0-alpha.1.22517.13 - 8.0.0-alpha.1.22517.13 - 8.0.0-alpha.1.22517.13 - 8.0.0-alpha.1.22517.13 + 8.0.0-alpha.1.22519.2 + 8.0.0-alpha.1.22519.2 + 8.0.0-alpha.1.22519.2 + 8.0.0-alpha.1.22519.2 + 8.0.0-alpha.1.22519.2 + 8.0.0-alpha.1.22519.2 + 8.0.0-alpha.1.22519.2 0.2.0 - 8.0.100-alpha.1.22517.34 - 8.0.100-alpha.1.22517.34 - 8.0.100-alpha.1.22517.34 + 8.0.100 + 8.0.100-alpha.1.22519.27 + 8.0.100-alpha.1.22519.27 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -89,10 +89,10 @@ - 8.0.0-alpha.1.22515.1 - 8.0.0-alpha.1.22515.1 - 8.0.0-alpha.1.22515.1 - 8.0.0-alpha.1.22515.1 + 8.0.0-alpha.1.22516.1 + 8.0.0-alpha.1.22516.1 + 8.0.0-alpha.1.22516.1 + 8.0.0-alpha.1.22516.1 @@ -185,7 +185,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.5.0-preview-20221013-06 + 17.5.0-preview-20221018-02 7.0.0-rc.1.22426.10 diff --git a/src/SourceBuild/tarball/patches/sdk/0002-Look-for-msbuild-net7.0-artifacts.patch b/src/SourceBuild/tarball/patches/sdk/0002-Look-for-msbuild-net7.0-artifacts.patch deleted file mode 100644 index cf69f8b84..000000000 --- a/src/SourceBuild/tarball/patches/sdk/0002-Look-for-msbuild-net7.0-artifacts.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Logan Bussell -Date: Tue, 20 Sep 2022 10:10:29 -0700 -Subject: [PATCH] Look for msbuild net7.0 artifacts - -This patch can be removed once https://github.com/dotnet/msbuild/pull/7790 flows -into dotnet/sdk, at which point that repo will need this change. ---- - .../Microsoft.DotNet.Cli.Utils.csproj | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj b/src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj -index 03ea923734..3246138cf9 100644 ---- a/src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj -+++ b/src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj -@@ -22,7 +22,7 @@ - - - -- $(PkgMicrosoft_Build_Runtime)\contentFiles\any\net6.0\MSBuild.dll -+ $(PkgMicrosoft_Build_Runtime)\contentFiles\any\net7.0\MSBuild.dll - - -