From e6ee3f43c7057c7edcae8c80960408f5c8dc5df1 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 1 Dec 2022 17:54:16 +0000 Subject: [PATCH] Merged PR 27900: [internal/release/6.0.3xx] Update dependencies from 4 repositories This pull request updates the following dependencies [marker]: <> (Begin:d1814f0c-875d-4709-e94c-08da181a39e5) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - **Subscription**: d1814f0c-875d-4709-e94c-08da181a39e5 - **Build**: 20221201.1 - **Date Produced**: December 1, 2022 11:41:46 AM UTC - **Commit**: 4855a55ebcfe897e6cc339c62edc653e27258e8c - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.12 to 6.0.13][6] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.12 to 6.0.13][6] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.12-servicing.22578.4 to 6.0.13-servicing.22601.1][6] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.12-servicing.22578.4 to 6.0.13-servicing.22601.1][6] - **Microsoft.NET.Sdk.WindowsDesktop**: [from 6.0.12-servicing.22569.2 to 6.0.13-servicing.22580.2][7] [6]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GCe8b4ef2&targetVersion=GC4855a55&_a=files [7]: https://dev.azure.com/dnceng/internal/_git/dotnet-wpf/branches?baseVersion=GC4178d79&targetVersion=GC9601ea7&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:d1814f0c-875d-4709-e94c-08da181a39e5) [marker]: <> (Begin:2e2c41e3-4520-418e-d824-08da180b2c46) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-templating - **Subscription**: 2e2c41e3-4520-418e-d824-08da180b2c46 - **Build**: 20221130.45 - **Date Produced**: December 1, 2022 4:51:27 AM UTC - **Commit**: 7e40218fedff9fad69162a8beab14468ac6c1cf3 - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.307 to 6.0.308][5] - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.307 to 6.0.308][5] - **Microsoft.TemplateEngine.Abstractions**: [from 6.0.307 to 6.0.308][5] - **Microsoft.TemplateEngine.Cli**: [from 6.0.307-servicing.22575.5 to 6.0.308-servicing.22580.45][5] - **Microsoft.TemplateEngine.Orchestrator.RunnableProjects**: [from 6.0.307 to 6.0.308][5] - **Microsoft.TemplateEngine.Utils**: [from 6.0.307 to 6.0.308][5] - **Microsoft.TemplateSearch.Common**: [from 6.0.307 to 6.0.308][5] [5]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GC3ef5e36&targetVersion=GC7e40218&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:2e2c41e3-4520-418e-d824-08da180b2c46) [marker]: <> (Begin:ffc11ea2-d045-4ff5-4d39-08da180de348) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - **Subscription**: ffc11ea2-d045-4ff5-4d39-08da180de348 - **Build**: 20221129.12 - **Date Produced**: November 30, 2022 12:15:29 AM UTC - **Commit**: b5b9e9e621bf9b17e4b7c71965a543a955c9f9fb - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) ... --- NuGet.config | 18 +++--- eng/Version.Details.xml | 140 ++++++++++++++++++++-------------------- eng/Versions.props | 36 +++++------ 3 files changed, 96 insertions(+), 98 deletions(-) diff --git a/NuGet.config b/NuGet.config index 46a503589894..2b6c8967740c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,21 +4,20 @@ - - + - + - + - + @@ -38,17 +37,16 @@ - + - - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 88addcf9979f..29e964cffaa4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,70 +1,70 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 3ef5e36b6022edc32ce62b1b85e964e0fefb0deb + 7e40218fedff9fad69162a8beab14468ac6c1cf3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 3ef5e36b6022edc32ce62b1b85e964e0fefb0deb + 7e40218fedff9fad69162a8beab14468ac6c1cf3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 3ef5e36b6022edc32ce62b1b85e964e0fefb0deb + 7e40218fedff9fad69162a8beab14468ac6c1cf3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 3ef5e36b6022edc32ce62b1b85e964e0fefb0deb + 7e40218fedff9fad69162a8beab14468ac6c1cf3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 3ef5e36b6022edc32ce62b1b85e964e0fefb0deb + 7e40218fedff9fad69162a8beab14468ac6c1cf3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 3ef5e36b6022edc32ce62b1b85e964e0fefb0deb + 7e40218fedff9fad69162a8beab14468ac6c1cf3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 3ef5e36b6022edc32ce62b1b85e964e0fefb0deb + 7e40218fedff9fad69162a8beab14468ac6c1cf3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 02e45a41b756dd147fc39297df7649d86fa245e7 + 1af80ba017f6f7644305e1781d8cc9845a92b5f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 02e45a41b756dd147fc39297df7649d86fa245e7 + 1af80ba017f6f7644305e1781d8cc9845a92b5f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 02e45a41b756dd147fc39297df7649d86fa245e7 + 1af80ba017f6f7644305e1781d8cc9845a92b5f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 02e45a41b756dd147fc39297df7649d86fa245e7 + 1af80ba017f6f7644305e1781d8cc9845a92b5f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 02e45a41b756dd147fc39297df7649d86fa245e7 + 1af80ba017f6f7644305e1781d8cc9845a92b5f8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 943474ca16db7c65ba6cff4a89c3ebd219dde3e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 02e45a41b756dd147fc39297df7649d86fa245e7 + 1af80ba017f6f7644305e1781d8cc9845a92b5f8 https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 02e45a41b756dd147fc39297df7649d86fa245e7 + 1af80ba017f6f7644305e1781d8cc9845a92b5f8 https://dev.azure.com/devdiv/DevDiv/_git/DotNet-msbuild-Trusted @@ -113,13 +113,13 @@ https://github.com/dotnet/roslyn 432d17a83aa5623e4581756f4d642997048056bd - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 54142bcb25544b72fac28b1b061e7788c91c4f49 + 50b7e9c661453874aa7a54a3985d5120564bb2e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 54142bcb25544b72fac28b1b061e7788c91c4f49 + 50b7e9c661453874aa7a54a3985d5120564bb2e5 https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted @@ -166,66 +166,66 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 70ae3df4a6f3c92fb6b315afc405edd10ff38579 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - e8b4ef2cfc595ccca430b7a3c31cad2855e003eb + 4855a55ebcfe897e6cc339c62edc653e27258e8c - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - e8b4ef2cfc595ccca430b7a3c31cad2855e003eb + 4855a55ebcfe897e6cc339c62edc653e27258e8c - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - e8b4ef2cfc595ccca430b7a3c31cad2855e003eb + 4855a55ebcfe897e6cc339c62edc653e27258e8c - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - e8b4ef2cfc595ccca430b7a3c31cad2855e003eb + 4855a55ebcfe897e6cc339c62edc653e27258e8c - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 4178d795849932702f98b7f375f6341267510326 + 9601ea7b0314d236be4e8dd482e0cc9222e95156 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 54142bcb25544b72fac28b1b061e7788c91c4f49 + 50b7e9c661453874aa7a54a3985d5120564bb2e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 54142bcb25544b72fac28b1b061e7788c91c4f49 + 50b7e9c661453874aa7a54a3985d5120564bb2e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 54142bcb25544b72fac28b1b061e7788c91c4f49 + 50b7e9c661453874aa7a54a3985d5120564bb2e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 54142bcb25544b72fac28b1b061e7788c91c4f49 + 50b7e9c661453874aa7a54a3985d5120564bb2e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 54142bcb25544b72fac28b1b061e7788c91c4f49 + 50b7e9c661453874aa7a54a3985d5120564bb2e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 54142bcb25544b72fac28b1b061e7788c91c4f49 + 50b7e9c661453874aa7a54a3985d5120564bb2e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 54142bcb25544b72fac28b1b061e7788c91c4f49 + 50b7e9c661453874aa7a54a3985d5120564bb2e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 54142bcb25544b72fac28b1b061e7788c91c4f49 + 50b7e9c661453874aa7a54a3985d5120564bb2e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 54142bcb25544b72fac28b1b061e7788c91c4f49 + 50b7e9c661453874aa7a54a3985d5120564bb2e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 54142bcb25544b72fac28b1b061e7788c91c4f49 + 50b7e9c661453874aa7a54a3985d5120564bb2e5 https://github.com/dotnet/razor-compiler @@ -242,21 +242,21 @@ fde127ba1cbee8a15c4a1fb8e46e686f3caac8ff - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 54142bcb25544b72fac28b1b061e7788c91c4f49 + 50b7e9c661453874aa7a54a3985d5120564bb2e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 54142bcb25544b72fac28b1b061e7788c91c4f49 + 50b7e9c661453874aa7a54a3985d5120564bb2e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 54142bcb25544b72fac28b1b061e7788c91c4f49 + 50b7e9c661453874aa7a54a3985d5120564bb2e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 54142bcb25544b72fac28b1b061e7788c91c4f49 + 50b7e9c661453874aa7a54a3985d5120564bb2e5 https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 965d051f4e3d..39b16b7bf0ac 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -43,13 +43,13 @@ - 6.0.12 - 6.0.12-servicing.22568.7 - 6.0.12 + 6.0.13 + 6.0.13-servicing.22580.9 + 6.0.13 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) 6.0.0 - 6.0.12 - 6.0.12-servicing.22568.7 + 6.0.13 + 6.0.13-servicing.22580.9 6.0.0-preview.7.21363.9 6.0.0 @@ -112,11 +112,11 @@ - 6.0.307-servicing.22575.5 - 6.0.307 - 6.0.307 - 6.0.307 - 6.0.307 + 6.0.308-servicing.22580.45 + 6.0.308 + 6.0.308 + 6.0.308 + 6.0.308 @@ -133,23 +133,23 @@ - 6.0.12-servicing.22571.9 - 6.0.12 - 6.0.12-servicing.22571.9 - 6.0.12-servicing.22571.9 - 6.0.12-servicing.22571.9 - 6.0.12 + 6.0.13-servicing.22580.13 + 6.0.13 + 6.0.13-servicing.22580.13 + 6.0.13-servicing.22580.13 + 6.0.13-servicing.22580.13 + 6.0.13 6.0.3-1.22213.1 6.0.3-1.22213.1 6.0.3-1.22213.1 - 6.0.12-servicing.22569.2 + 6.0.13-servicing.22580.2 - 6.0.12-servicing.22578.4 + 6.0.13-servicing.22601.1