From fa0647c82aec9d2c180fbacf2520e3e4d4865af3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 11 Aug 2022 22:05:59 -0500 Subject: [PATCH] [main] Update dependencies from dotnet/sdk (#14281) * Update dependencies from https://github.com/dotnet/sdk build 20220809.4 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 7.0.100-rc.1.22404.18 -> To Version 7.0.100-rc.1.22409.4 Dependency coherency updates Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0 From Version 7.0.0-rc.1.22403.8 -> To Version 7.0.0-rc.1.22408.8 (parent: Microsoft.NET.Sdk * Remove two backported source-build patches * source-build changes to support templating combining w/sdk * Additional sdk templating patches * Fix patch conflict * Update dependencies from https://github.com/dotnet/sdk build 20220809.4 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 7.0.100-rc.1.22409.4 -> To Version 7.0.100-dev Dependency coherency updates Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0 From Version 7.0.0-rc.1.22403.8 -> To Version 7.0.0-rc.1.22408.8 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220811.4 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rc.1.22409.4 -> To Version 7.0.100-rc.1.22411.4 Dependency coherency updates Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0 From Version 7.0.0-rc.1.22403.8 -> To Version 7.0.0-rc.1.22410.1 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220811.3 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rc.1.22409.4 -> To Version 7.0.100-rc.1.22411.3 Dependency coherency updates Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0 From Version 7.0.0-rc.1.22403.8 -> To Version 7.0.0-rc.1.22410.1 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220811.5 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rc.1.22409.4 -> To Version 7.0.100-rc.1.22411.5 Dependency coherency updates Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0 From Version 7.0.0-rc.1.22403.8 -> To Version 7.0.0-rc.1.22410.1 (parent: Microsoft.NET.Sdk * Remove backported source-build sdk patches * Revert "source-build changes to support templating combining w/sdk" This reverts commit 7223d6eb777cbeb771812ff5a4d9cf4289aa4833. * Update source-build dependencies * Update dependencies from https://github.com/dotnet/sdk build 20220811.7 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rc.1.22409.4 -> To Version 7.0.100-rc.1.22411.7 Dependency coherency updates Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0 From Version 7.0.0-rc.1.22403.8 -> To Version 7.0.0-rc.1.22410.1 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220811.9 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rc.1.22409.4 -> To Version 7.0.100-rc.1.22411.9 Dependency coherency updates Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0 From Version 7.0.0-rc.1.22403.8 -> To Version 7.0.0-rc.1.22410.1 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220811.10 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rc.1.22409.4 -> To Version 7.0.100-rc.1.22411.10 Dependency coherency updates Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0 From Version 7.0.0-rc.1.22403.8 -> To Version 7.0.0-rc.1.22410.9 (parent: Microsoft.NET.Sdk * Pull in latest sdk locally via darc Co-authored-by: dotnet-maestro[bot] Co-authored-by: MichaelSimons --- eng/Version.Details.xml | 96 +++++++++---------- eng/Versions.props | 36 +++---- .../tarball/content/repos/installer.proj | 1 - ...ppbuilder-package-version-references.patch | 39 -------- ...4-workaround-invalid-warning-message.patch | 25 ----- 5 files changed, 66 insertions(+), 131 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/runtime/0002-Refactor-wasmappbuilder-package-version-references.patch delete mode 100644 src/SourceBuild/tarball/patches/runtime/0004-workaround-invalid-warning-message.patch diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 024007cd1..31f103795 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop d5046afdd2d0e6234ae3fc5bd4ae878594079cc7 - + https://github.com/dotnet/runtime - 26a71c61fbda229f151afb14e274604b4926df5c + 7be37908e5a1cbb83b1062768c1649827eeaceaa - + https://github.com/dotnet/runtime - 26a71c61fbda229f151afb14e274604b4926df5c + 7be37908e5a1cbb83b1062768c1649827eeaceaa - + https://github.com/dotnet/runtime - 26a71c61fbda229f151afb14e274604b4926df5c + 7be37908e5a1cbb83b1062768c1649827eeaceaa - + https://github.com/dotnet/runtime - 26a71c61fbda229f151afb14e274604b4926df5c + 7be37908e5a1cbb83b1062768c1649827eeaceaa - + https://github.com/dotnet/runtime - 26a71c61fbda229f151afb14e274604b4926df5c + 7be37908e5a1cbb83b1062768c1649827eeaceaa - + https://github.com/dotnet/runtime - 26a71c61fbda229f151afb14e274604b4926df5c + 7be37908e5a1cbb83b1062768c1649827eeaceaa @@ -48,38 +48,38 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 26a71c61fbda229f151afb14e274604b4926df5c + 7be37908e5a1cbb83b1062768c1649827eeaceaa - + https://github.com/dotnet/aspnetcore - 80ea57377a90fa2750f46662be3642b59ad0feed + 34f5a4fcfaf9a9e1906c432e4d0411fcc78b3177 - + https://github.com/dotnet/aspnetcore - 80ea57377a90fa2750f46662be3642b59ad0feed + 34f5a4fcfaf9a9e1906c432e4d0411fcc78b3177 - + https://github.com/dotnet/aspnetcore - 80ea57377a90fa2750f46662be3642b59ad0feed + 34f5a4fcfaf9a9e1906c432e4d0411fcc78b3177 - + https://github.com/dotnet/aspnetcore - 80ea57377a90fa2750f46662be3642b59ad0feed + 34f5a4fcfaf9a9e1906c432e4d0411fcc78b3177 - + https://github.com/dotnet/aspnetcore - 80ea57377a90fa2750f46662be3642b59ad0feed + 34f5a4fcfaf9a9e1906c432e4d0411fcc78b3177 - + https://github.com/dotnet/aspnetcore - 80ea57377a90fa2750f46662be3642b59ad0feed + 34f5a4fcfaf9a9e1906c432e4d0411fcc78b3177 - + https://github.com/dotnet/aspnetcore - 80ea57377a90fa2750f46662be3642b59ad0feed + 34f5a4fcfaf9a9e1906c432e4d0411fcc78b3177 https://github.com/dotnet/test-templates @@ -98,22 +98,22 @@ 0385265f4d0b6413d64aea0223172366a9b9858c - + https://github.com/dotnet/sdk - 215b2c8c993c2a5ca47f5e76d52122853a29c4ce + 55052f16a491fc83a4ba1bbb1a32873fb1454cd0 - + https://github.com/dotnet/sdk - 215b2c8c993c2a5ca47f5e76d52122853a29c4ce + 55052f16a491fc83a4ba1bbb1a32873fb1454cd0 - + https://github.com/dotnet/sdk - 6e00e543bbeb8e0491420e2f6b3f7d235166596d + 55052f16a491fc83a4ba1bbb1a32873fb1454cd0 - + https://github.com/dotnet/sdk - 6e00e543bbeb8e0491420e2f6b3f7d235166596d + 55052f16a491fc83a4ba1bbb1a32873fb1454cd0 @@ -124,18 +124,18 @@ https://github.com/dotnet/wpf cd58f79f496337e608662e168c80ac8abd0d151b - + https://github.com/dotnet/fsharp - fa2b1d3ec056f43f64c07c800efa28ab396c2e38 + 7eb47e9f3dba867dbc9493c5a4297f88ac6b2edb - + https://github.com/dotnet/fsharp - fa2b1d3ec056f43f64c07c800efa28ab396c2e38 + 7eb47e9f3dba867dbc9493c5a4297f88ac6b2edb - + https://github.com/microsoft/vstest - 63149fdc913835956b51759399e0d0ede3ad0ac3 + 311e76b0b16936340c18172fff8d3a98d4527f22 @@ -144,19 +144,19 @@ linker - + https://github.com/dotnet/roslyn - 83ae84b2a99a0bb1cb83525db21d467b99fd0159 + 8085fcfc48b6031cdcd59a16e9380803af6b1a67 - + https://github.com/dotnet/msbuild - 4e58a8330e87412ff43ebe71712394aadfdee208 + 4ac5d65dea2ca012449480c951dd7762563188ea - + https://github.com/nuget/nuget.client - 421801a875b876882ffe24d87e7ea0862bb1b41f + cf6d15e81f43e96f56b314a3706d8ed9195352f6 diff --git a/eng/Versions.props b/eng/Versions.props index 26d0596cf..cfde5d7e1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -49,38 +49,38 @@ - 7.0.0-rc.1.22404.6 - 7.0.0-rc.1.22404.6 - 7.0.0-rc.1.22404.6 - 7.0.0-rc.1.22404.6 - 7.0.0-rc.1.22404.6 - 7.0.0-rc.1.22404.6 - 7.0.0-rc.1.22404.6 + 7.0.0-rc.1.22411.2 + 7.0.0-rc.1.22411.2 + 7.0.0-rc.1.22411.2 + 7.0.0-rc.1.22411.2 + 7.0.0-rc.1.22411.2 + 7.0.0-rc.1.22411.2 + 7.0.0-rc.1.22411.2 0.2.0 - 7.0.100-rc.1.22409.4 - 7.0.100-rc.1.22404.18 - 7.0.100-rc.1.22404.18 + 7.0.100-rc.1.22411.15 + 7.0.100-rc.1.22411.15 + 7.0.100-rc.1.22411.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 7.0.0-rc.1.22403.8 + 7.0.0-rc.1.22410.9 - 7.0.0-rc.1.22403.8 - 7.0.0-rc.1.22403.8 - 7.0.0-rc.1.22403.8 - 7.0.0-rc.1.22403.8 - 7.0.0-rc.1.22403.8 - 7.0.0-rc.1.22403.8 + 7.0.0-rc.1.22410.9 + 7.0.0-rc.1.22410.9 + 7.0.0-rc.1.22410.9 + 7.0.0-rc.1.22410.9 + 7.0.0-rc.1.22410.9 + 7.0.0-rc.1.22410.9 2.1.0 @@ -166,7 +166,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.4.0-preview-20220727-01 + 17.4.0-preview-20220811-01 diff --git a/src/SourceBuild/tarball/content/repos/installer.proj b/src/SourceBuild/tarball/content/repos/installer.proj index f0f17e2a8..f6803f4cf 100644 --- a/src/SourceBuild/tarball/content/repos/installer.proj +++ b/src/SourceBuild/tarball/content/repos/installer.proj @@ -62,7 +62,6 @@ - diff --git a/src/SourceBuild/tarball/patches/runtime/0002-Refactor-wasmappbuilder-package-version-references.patch b/src/SourceBuild/tarball/patches/runtime/0002-Refactor-wasmappbuilder-package-version-references.patch deleted file mode 100644 index 92e348c89..000000000 --- a/src/SourceBuild/tarball/patches/runtime/0002-Refactor-wasmappbuilder-package-version-references.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: MichaelSimons -Date: Wed, 6 Jul 2022 21:23:02 +0000 -Subject: [PATCH] Refactor wasmappbuilder's package version references to use - versions.props - -Backport: https://github.com/dotnet/runtime/pull/70582 ---- - eng/Versions.props | 1 + - src/tasks/WasmAppBuilder/WasmAppBuilder.csproj | 4 ++-- - 2 files changed, 3 insertions(+), 2 deletions(-) - -diff --git a/eng/Versions.props b/eng/Versions.props -index 1a8c79e7221..60218bed123 100644 ---- a/eng/Versions.props -+++ b/eng/Versions.props -@@ -104,6 +104,7 @@ - 4.7.0 - 4.7.0 - 4.7.0 -+ 4.7.1 - 4.3.0 - 6.0.0 - 4.3.1 -diff --git a/src/tasks/WasmAppBuilder/WasmAppBuilder.csproj b/src/tasks/WasmAppBuilder/WasmAppBuilder.csproj -index 7c8465c6bc0..05447ef45ff 100644 ---- a/src/tasks/WasmAppBuilder/WasmAppBuilder.csproj -+++ b/src/tasks/WasmAppBuilder/WasmAppBuilder.csproj -@@ -20,8 +20,8 @@ - - - -- -- -+ -+ - - - diff --git a/src/SourceBuild/tarball/patches/runtime/0004-workaround-invalid-warning-message.patch b/src/SourceBuild/tarball/patches/runtime/0004-workaround-invalid-warning-message.patch deleted file mode 100644 index 4525e5890..000000000 --- a/src/SourceBuild/tarball/patches/runtime/0004-workaround-invalid-warning-message.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: MichaelSimons -Date: Fri, 5 Aug 2022 15:26:42 +0000 -Subject: [PATCH] workaround invalid warning message - -Temporary fix to unblock work until runtime provides a fix. - -Backport: https://github.com/dotnet/runtime/issues/73463 ---- - eng/packaging.targets | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/eng/packaging.targets b/eng/packaging.targets -index ac639efe49c..1929f2f1251 100644 ---- a/eng/packaging.targets -+++ b/eng/packaging.targets -@@ -200,7 +200,7 @@ - - -- -+ - - ]]> -