From 65eeecc57dcd9183c937b22e435ac60102ca8127 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 19 May 2023 18:25:49 +0000 Subject: [PATCH] Merged PR 31117: [internal/release/7.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:ca5481e4-f667-4dcd-b176-08db3b93de76) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: ca5481e4-f667-4dcd-b176-08db3b93de76 - **Build**: 20230504.19 - **Date Produced**: May 4, 2023 10:45:02 PM UTC - **Commit**: c67c38873cc5cd6d45b6954e4782ea80e0913345 - **Branch**: refs/heads/internal/release/7.0.302 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.300 to 7.0.302][9] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.300-rtm.23218.9 to 7.0.302-servicing.23254.19][9] - **Microsoft.NET.Sdk**: [from 7.0.300-rtm.23218.9 to 7.0.302-servicing.23254.19][9] - **Microsoft.TemplateEngine.Cli**: [from 7.0.300-rtm.23218.9 to 7.0.302-servicing.23254.19][9] - **Microsoft.WindowsDesktop.App.Ref**: [from 7.0.6 to 7.0.5][10] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: [from 7.0.6-servicing.23213.14 to 7.0.5-servicing.23177.5][10] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: [from 7.0.6-servicing.23213.14 to 7.0.5-servicing.23177.5][10] - **Microsoft.NETCore.App.Ref**: [from 7.0.6 to 7.0.5][11] - **VS.Redist.Common.NetCore.TargetingPack.x64.7.0**: [from 7.0.6-servicing.23212.12 to 7.0.5-servicing.23174.5][11] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 7.0.6 to 7.0.5][11] - **Microsoft.NETCore.App.Host.win-x64**: [from 7.0.6 to 7.0.5][11] - **Microsoft.NETCore.DotNetHostResolver**: [from 7.0.6 to 7.0.5][11] - **Microsoft.AspNetCore.App.Ref**: [from 7.0.6 to 7.0.5][12] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 7.0.6-servicing.23217.6 to 7.0.5-servicing.23174.10][12] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 7.0.6 to 7.0.5][12] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: [from 7.0.6-servicing.23217.6 to 7.0.5-servicing.23174.10][12] - **dotnet-dev-certs**: [from 7.0.6-servicing.23217.6 to 7.0.5-servicing.23174.10][12] - **dotnet-user-jwts**: [from 7.0.6-servicing.23217.6 to 7.0.5-servicing.23174.10][12] - **dotnet-user-secrets**: [from 7.0.6-servicing.23217.6 to 7.0.5-servicing.23174.10][12] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 7.0.6 to 7.0.5][10] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 7.0.6-servicing.23213.5 to 7.0.5-servicing.23175.1][13] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 7.0.6 to 7.0.5][10] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 7.0.6-servicing.23213.10 to 7.0.5-servicing.23176.1][14] - **NuGet.Build.Tasks**: [from 6.6.0-rc.66 to 6.6.0-preview.3.61][15] - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: [from 7.0.6-servicing.23212.12 to 7.0.5-servicing.23174.5][11] - **Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100**: [from 7.0.6 to 7.0.5][16] - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: [from 7.0.6-servicing.23212.12 to 7.0.5-servicing.... --- NuGet.config | 24 +++----- eng/Version.Details.xml | 118 ++++++++++++++++++++-------------------- eng/Versions.props | 48 ++++++++-------- 3 files changed, 92 insertions(+), 98 deletions(-) diff --git a/NuGet.config b/NuGet.config index 768f2c308..17e655b64 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,25 +7,21 @@ - - + - - + - - + - + - - + @@ -47,17 +43,15 @@ - + - - + - + - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 67e807b32..e9b990d31 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0af2ffd343917ef04085946fb40e75474b391ccf + 77a647a7f1d75f63551fe656b350229562ac04a4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0af2ffd343917ef04085946fb40e75474b391ccf + 77a647a7f1d75f63551fe656b350229562ac04a4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0af2ffd343917ef04085946fb40e75474b391ccf + 77a647a7f1d75f63551fe656b350229562ac04a4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0af2ffd343917ef04085946fb40e75474b391ccf + 77a647a7f1d75f63551fe656b350229562ac04a4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e3acf029e62f07dde1a169096afeade58b0418ab + 4906b56cca652ec986cb46bf1b4a9cc1fe1efe26 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e3acf029e62f07dde1a169096afeade58b0418ab + 4906b56cca652ec986cb46bf1b4a9cc1fe1efe26 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e3acf029e62f07dde1a169096afeade58b0418ab + 4906b56cca652ec986cb46bf1b4a9cc1fe1efe26 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e3acf029e62f07dde1a169096afeade58b0418ab + 4906b56cca652ec986cb46bf1b4a9cc1fe1efe26 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e3acf029e62f07dde1a169096afeade58b0418ab + 4906b56cca652ec986cb46bf1b4a9cc1fe1efe26 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e3acf029e62f07dde1a169096afeade58b0418ab + 4906b56cca652ec986cb46bf1b4a9cc1fe1efe26 @@ -52,34 +52,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 8042d61b17540e49e53569e3728d2faa1c596583 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4515d4e1d70b50f899ee35cedf6be3a31098dd92 + 2be1f3d56a3680c9fdf7a1d182e400cdc8885474 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4515d4e1d70b50f899ee35cedf6be3a31098dd92 + 2be1f3d56a3680c9fdf7a1d182e400cdc8885474 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4515d4e1d70b50f899ee35cedf6be3a31098dd92 + 2be1f3d56a3680c9fdf7a1d182e400cdc8885474 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4515d4e1d70b50f899ee35cedf6be3a31098dd92 + 2be1f3d56a3680c9fdf7a1d182e400cdc8885474 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4515d4e1d70b50f899ee35cedf6be3a31098dd92 + 2be1f3d56a3680c9fdf7a1d182e400cdc8885474 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4515d4e1d70b50f899ee35cedf6be3a31098dd92 + 2be1f3d56a3680c9fdf7a1d182e400cdc8885474 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4515d4e1d70b50f899ee35cedf6be3a31098dd92 + 2be1f3d56a3680c9fdf7a1d182e400cdc8885474 https://github.com/dotnet/test-templates @@ -98,31 +98,31 @@ 45a41b353d078e4d1e5918246fddbacb452eb210 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fb94b17af2dd037d0b2e4d551efde34812083ba5 + 4046bbcae7c95a913ded86e1fc4a4572e2237b1c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fb94b17af2dd037d0b2e4d551efde34812083ba5 + 4046bbcae7c95a913ded86e1fc4a4572e2237b1c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fb94b17af2dd037d0b2e4d551efde34812083ba5 + 4046bbcae7c95a913ded86e1fc4a4572e2237b1c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fb94b17af2dd037d0b2e4d551efde34812083ba5 + 4046bbcae7c95a913ded86e1fc4a4572e2237b1c - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - b3dce1f781e8f035f43da3d5eb11d4916d1be36f + 0fcdb8d3ba0a80a9d77518f1cc2a1f68875aed77 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 2c5505b6cdfe7e0be6283d8b2f9968139cc54087 + 671efc4e6651576c7e69408dbc8cacc4cf3d7ceb https://github.com/dotnet/fsharp @@ -144,36 +144,36 @@ linker - + https://github.com/dotnet/roslyn - d78a163b525fd73efb768f4f0095590f9ade3469 + c3cc1d0ceeab1a65da0217e403851a1e8a30086a - + https://github.com/dotnet/msbuild - 8ffc3fe3dc15b17ecf39a289deb5cd7fb65993a0 + 07e2947214f1a9f28a3517762c939d5bebb5f525 - + https://github.com/dotnet/msbuild - 8ffc3fe3dc15b17ecf39a289deb5cd7fb65993a0 + 07e2947214f1a9f28a3517762c939d5bebb5f525 - - https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted - a36edf3a2bf891d6aabfc83cc0b21d24a870ea1a + + https://github.com/nuget/nuget.client + 0fa557836fa35aee7d60776ef0c88176dbcd22ac https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - b0eec69ee7bdab81823db7d6482cb6cff9f07e48 + b3cf128502f8fc7f9f9212a4dfaff67a2bce7bda - + https://github.com/dotnet/emsdk - b0eec69ee7bdab81823db7d6482cb6cff9f07e48 + b3cf128502f8fc7f9f9212a4dfaff67a2bce7bda https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index 2dce7d589..137cda42f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.6-servicing.23213.5 + 7.0.7-servicing.23252.4 - 7.0.6-servicing.23213.10 + 7.0.7-servicing.23261.3 @@ -56,22 +56,22 @@ - 7.0.6 - 7.0.6 - 7.0.6-servicing.23217.6 - 7.0.6-servicing.23217.6 - 7.0.6-servicing.23217.6 - 7.0.6-servicing.23217.6 - 7.0.6-servicing.23217.6 + 7.0.7 + 7.0.7 + 7.0.7-servicing.23268.10 + 7.0.7-servicing.23268.10 + 7.0.7-servicing.23268.10 + 7.0.7-servicing.23268.10 + 7.0.7-servicing.23268.10 0.2.0 - 7.0.300 - 7.0.300-rtm.23218.9 - 7.0.300-rtm.23218.9 + 7.0.304 + 7.0.304-servicing.23269.7 + 7.0.304-servicing.23269.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -82,20 +82,20 @@ - 7.0.6-servicing.23212.12 - 7.0.6-servicing.23212.12 - 7.0.6 - 7.0.6 - 7.0.6 - 7.0.6 + 7.0.7-servicing.23268.2 + 7.0.7-servicing.23268.2 + 7.0.7 + 7.0.7 + 7.0.7 + 7.0.7 2.1.0 - 7.0.6-servicing.23213.14 - 7.0.6-servicing.23213.14 - 7.0.6 - 7.0.6 + 7.0.7-servicing.23267.3 + 7.0.7-servicing.23267.3 + 7.0.7 + 7.0.7 @@ -227,8 +227,8 @@ 12.3.2372 16.0.1478 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.6 - 7.0.6 + 7.0.7 + 7.0.7 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version)