From 9adf3a6cb91cb36053de1f0ccffe297525f4a3d4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 4 Aug 2022 18:49:22 -0500 Subject: [PATCH] [main] Update dependencies from dotnet/sdk (#14258) * Update dependencies from https://github.com/dotnet/sdk build 20220803.12 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 7.0.100-rc.1.22403.11 -> To Version 7.0.100-rc.1.22403.12 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 12.0.6-beta.22381.3 -> To Version 12.0.6-beta.22402.2 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220803.14 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 7.0.100-rc.1.22403.11 -> To Version 7.0.100-rc.1.22403.14 Dependency coherency updates 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 From Version 7.0.0-rc.1.22403.3 -> To Version 7.0.0-rc.1.22403.6 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220803.15 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 7.0.100-rc.1.22403.11 -> To Version 7.0.100-rc.1.22403.15 * Update dependencies from https://github.com/dotnet/sdk build 20220803.21 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 7.0.100-rc.1.22403.15 -> To Version 7.0.100-rc.1.22403.21 * Dependency coherency updates 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.Compilers.Toolset From Version 7.0.0-rc.1.22403.3 -> To Version 7.0.0-rc.1.22403.7 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220803.22 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 7.0.100-rc.1.22403.11 -> To Version 7.0.100-rc.1.22403.22 Dependency coherency updates 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.Compilers.Toolset From Version 7.0.0-rc.1.22403.3 -> To Version 7.0.0-rc.1.22403.7 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220803.24 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 7.0.100-rc.1.22403.11 -> To Version 7.0.100-rc.1.22403.24 Dependency coherency updates 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.Compilers.Toolset From Version 7.0.0-rc.1.22403.3 -> To Version 7.0.0-rc.1.22403.7 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220803.25 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 7.0.100-rc.1.22403.11 -> To Version 7.0.100-rc.1.22403.25 Dependency coherency updates 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.Compilers.Toolset From Version 7.0.0-rc.1.22403.3 -> To Version 7.0.0-rc.1.22403.13 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220803.26 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 7.0.100-rc.1.22403.11 -> To Version 7.0.100-rc.1.22403.26 Dependency coherency updates 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.Compilers.Toolset From Version 7.0.0-rc.1.22403.3 -> To Version 7.0.0-rc.1.22403.13 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220804.1 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 7.0.100-rc.1.22403.11 -> To Version 7.0.100-rc.1.22404.1 Dependency coherency updates 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.Compilers.Toolset From Version 7.0.0-rc.1.22403.3 -> To Version 7.0.0-rc.1.22403.13 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220804.2 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 7.0.100-rc.1.22403.11 -> To Version 7.0.100-rc.1.22404.2 Dependency coherency updates 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.Compilers.Toolset From Version 7.0.0-rc.1.22403.3 -> To Version 7.0.0-rc.1.22403.14 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220804.3 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 7.0.100-rc.1.22403.11 -> To Version 7.0.100-rc.1.22404.3 Dependency coherency updates 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.Compilers.Toolset,NuGet.Build.Tasks From Version 7.0.0-rc.1.22403.3 -> To Version 7.0.0-rc.1.22403.14 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220804.4 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 7.0.100-rc.1.22403.11 -> To Version 7.0.100-rc.1.22404.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.Compilers.Toolset,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0 From Version 7.0.0-rc.1.22402.10 -> To Version 7.0.0-rc.1.22403.8 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220804.5 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 7.0.100-rc.1.22403.11 -> To Version 7.0.100-rc.1.22404.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.Compilers.Toolset,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0 From Version 7.0.0-rc.1.22402.10 -> To Version 7.0.0-rc.1.22403.8 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220804.6 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 7.0.100-rc.1.22403.11 -> To Version 7.0.100-rc.1.22404.6 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.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0 From Version 7.0.0-rc.1.22402.10 -> To Version 7.0.0-rc.1.22403.8 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220804.7 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 7.0.100-rc.1.22403.11 -> To Version 7.0.100-rc.1.22404.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.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0 From Version 7.0.0-rc.1.22402.10 -> To Version 7.0.0-rc.1.22403.8 (parent: Microsoft.NET.Sdk * Remove backported nuget-client source-build patch * Update dependencies from https://github.com/dotnet/sdk build 20220804.10 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 7.0.100-rc.1.22403.11 -> To Version 7.0.100-rc.1.22404.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.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0 From Version 7.0.0-rc.1.22402.10 -> To Version 7.0.0-rc.1.22403.8 (parent: Microsoft.NET.Sdk Co-authored-by: dotnet-maestro[bot] Co-authored-by: MichaelSimons --- eng/Version.Details.xml | 92 +++++++++---------- eng/Versions.props | 34 +++---- ...-and-unsafe-paths-to-be-able-to-appl.patch | 23 ----- 3 files changed, 63 insertions(+), 86 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/nuget-client/0001-Enable-work-tree-and-unsafe-paths-to-be-able-to-appl.patch diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ffea0fd4d..11a363d1b 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 - a6c0d5c483273725a3626ddbbb355464f3753f09 + 26a71c61fbda229f151afb14e274604b4926df5c - + https://github.com/dotnet/runtime - a6c0d5c483273725a3626ddbbb355464f3753f09 + 26a71c61fbda229f151afb14e274604b4926df5c - + https://github.com/dotnet/runtime - a6c0d5c483273725a3626ddbbb355464f3753f09 + 26a71c61fbda229f151afb14e274604b4926df5c - + https://github.com/dotnet/runtime - a6c0d5c483273725a3626ddbbb355464f3753f09 + 26a71c61fbda229f151afb14e274604b4926df5c - + https://github.com/dotnet/runtime - a6c0d5c483273725a3626ddbbb355464f3753f09 + 26a71c61fbda229f151afb14e274604b4926df5c - + https://github.com/dotnet/runtime - a6c0d5c483273725a3626ddbbb355464f3753f09 + 26a71c61fbda229f151afb14e274604b4926df5c @@ -48,38 +48,38 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - a6c0d5c483273725a3626ddbbb355464f3753f09 + 26a71c61fbda229f151afb14e274604b4926df5c - + https://github.com/dotnet/aspnetcore - 846f0fd3cc4217582c00da10ad590704288190af + 8bc67a3aa977153b94dc69a4c8713ccd57ade4f1 - + https://github.com/dotnet/aspnetcore - 846f0fd3cc4217582c00da10ad590704288190af + 8bc67a3aa977153b94dc69a4c8713ccd57ade4f1 - + https://github.com/dotnet/aspnetcore - 846f0fd3cc4217582c00da10ad590704288190af + 8bc67a3aa977153b94dc69a4c8713ccd57ade4f1 - + https://github.com/dotnet/aspnetcore - 846f0fd3cc4217582c00da10ad590704288190af + 8bc67a3aa977153b94dc69a4c8713ccd57ade4f1 - + https://github.com/dotnet/aspnetcore - 846f0fd3cc4217582c00da10ad590704288190af + 8bc67a3aa977153b94dc69a4c8713ccd57ade4f1 - + https://github.com/dotnet/aspnetcore - 846f0fd3cc4217582c00da10ad590704288190af + 8bc67a3aa977153b94dc69a4c8713ccd57ade4f1 - + https://github.com/dotnet/aspnetcore - 846f0fd3cc4217582c00da10ad590704288190af + 8bc67a3aa977153b94dc69a4c8713ccd57ade4f1 https://github.com/dotnet/test-templates @@ -98,23 +98,23 @@ 55850e286f61d4f558c1b2b3603cf1fb02c4b3e7 - + https://github.com/dotnet/templating - 76e20c80315d948e8a7bb0f9e816409916c7bf86 + 73c68c816b06f4dc8f65a9b3c6b7292888cbdde2 - + https://github.com/dotnet/templating - 76e20c80315d948e8a7bb0f9e816409916c7bf86 + 73c68c816b06f4dc8f65a9b3c6b7292888cbdde2 - + https://github.com/dotnet/sdk - e09dc36be374e3f31d28e3d95c92c4f5c0479aa8 + f50baae3ad5fdfae2eacd7c58ce81067b9b2f64b - + https://github.com/dotnet/sdk - e09dc36be374e3f31d28e3d95c92c4f5c0479aa8 + f50baae3ad5fdfae2eacd7c58ce81067b9b2f64b @@ -125,13 +125,13 @@ https://github.com/dotnet/wpf cd58f79f496337e608662e168c80ac8abd0d151b - + https://github.com/dotnet/fsharp - a5d1d69f1d8b31bb7c6dbc2eb2cdc69a3e54c9db + fa2b1d3ec056f43f64c07c800efa28ab396c2e38 - + https://github.com/dotnet/fsharp - a5d1d69f1d8b31bb7c6dbc2eb2cdc69a3e54c9db + fa2b1d3ec056f43f64c07c800efa28ab396c2e38 @@ -145,19 +145,19 @@ linker - + https://github.com/dotnet/roslyn - e2373f49bc01a28b0d7661b604eb725ac881c4e4 + 83ae84b2a99a0bb1cb83525db21d467b99fd0159 - + https://github.com/dotnet/msbuild - 23c57cb11da1a14fd5f5afbcf571dafd3fad0911 + 4e58a8330e87412ff43ebe71712394aadfdee208 - + https://github.com/nuget/nuget.client - cc1674f7ca728c088495aa38fc68dd07df2840c4 + 421801a875b876882ffe24d87e7ea0862bb1b41f diff --git a/eng/Versions.props b/eng/Versions.props index 1aa0e4586..a59860e37 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -38,7 +38,7 @@ - 7.0.100-rc.1.22403.7 + 7.0.100-rc.1.22404.1 @@ -52,37 +52,37 @@ - 7.0.0-rc.1.22403.3 - 7.0.0-rc.1.22403.3 - 7.0.0-rc.1.22403.3 - 7.0.0-rc.1.22403.3 - 7.0.0-rc.1.22403.3 - 7.0.0-rc.1.22403.3 - 7.0.0-rc.1.22403.3 + 7.0.0-rc.1.22404.1 + 7.0.0-rc.1.22404.1 + 7.0.0-rc.1.22404.1 + 7.0.0-rc.1.22404.1 + 7.0.0-rc.1.22404.1 + 7.0.0-rc.1.22404.1 + 7.0.0-rc.1.22404.1 0.2.0 - 7.0.100-rc.1.22403.11 - 7.0.100-rc.1.22403.11 + 7.0.100-rc.1.22404.10 + 7.0.100-rc.1.22404.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 7.0.0-rc.1.22402.10 + 7.0.0-rc.1.22403.8 - 7.0.0-rc.1.22402.10 - 7.0.0-rc.1.22402.10 - 7.0.0-rc.1.22402.10 - 7.0.0-rc.1.22402.10 - 7.0.0-rc.1.22402.10 - 7.0.0-rc.1.22402.10 + 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 2.1.0 diff --git a/src/SourceBuild/tarball/patches/nuget-client/0001-Enable-work-tree-and-unsafe-paths-to-be-able-to-appl.patch b/src/SourceBuild/tarball/patches/nuget-client/0001-Enable-work-tree-and-unsafe-paths-to-be-able-to-appl.patch deleted file mode 100644 index 143e0c7b7..000000000 --- a/src/SourceBuild/tarball/patches/nuget-client/0001-Enable-work-tree-and-unsafe-paths-to-be-able-to-appl.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Chris Rummel -Date: Wed, 22 Jun 2022 05:55:51 -0500 -Subject: [PATCH] Enable work-tree and unsafe-paths to be able to apply in the - checked-in tarball. - ---- - eng/source-build/source-build.proj | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/eng/source-build/source-build.proj b/eng/source-build/source-build.proj -index cbdd6d8..a3e3d63 100644 ---- a/eng/source-build/source-build.proj -+++ b/eng/source-build/source-build.proj -@@ -57,7 +57,7 @@ - - - -