From da24bbdc2b17fdace5d4122e8332c990d3cb7567 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 22 Mar 2023 21:09:54 +0000 Subject: [PATCH] Merged PR 30132: [internal/release/7.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:65272799-fe4d-4dbf-f0fe-08da7ef63651) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 65272799-fe4d-4dbf-f0fe-08da7ef63651 - **Build**: 20230322.16 - **Date Produced**: March 22, 2023 7:42:49 PM UTC - **Commit**: b50c05b6a97a7d33d1507869510bc0591d105222 - **Branch**: refs/heads/internal/release/7.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.105 to 7.0.105][2] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.105-servicing.23167.11 to 7.0.105-servicing.23172.16][2] - **Microsoft.NET.Sdk**: [from 7.0.105-servicing.23167.11 to 7.0.105-servicing.23172.16][2] - **Microsoft.TemplateEngine.Cli**: [from 7.0.105-servicing.23167.11 to 7.0.105-servicing.23172.16][2] - **Microsoft.WindowsDesktop.App.Ref**: [from 7.0.4 to 7.0.4][3] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: [from 7.0.4-servicing.23118.3 to 7.0.4-servicing.23172.5][3] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: [from 7.0.4-servicing.23118.3 to 7.0.4-servicing.23172.5][3] - **Microsoft.NETCore.App.Ref**: [from 7.0.5 to 7.0.5][4] - **VS.Redist.Common.NetCore.TargetingPack.x64.7.0**: [from 7.0.5-servicing.23163.9 to 7.0.5-servicing.23171.12][4] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 7.0.5 to 7.0.5][4] - **Microsoft.NETCore.App.Host.win-x64**: [from 7.0.5 to 7.0.5][4] - **Microsoft.NETCore.DotNetHostResolver**: [from 7.0.5 to 7.0.5][4] - **Microsoft.NETCore.Platforms**: [from 7.0.2 to 7.0.2][4] - **Microsoft.AspNetCore.App.Ref**: [from 7.0.5 to 7.0.5][5] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 7.0.5-servicing.23166.6 to 7.0.5-servicing.23171.9][5] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 7.0.5 to 7.0.5][5] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: [from 7.0.5-servicing.23166.6 to 7.0.5-servicing.23171.9][5] - **dotnet-dev-certs**: [from 7.0.5-servicing.23166.6 to 7.0.5-servicing.23171.9][5] - **dotnet-user-jwts**: [from 7.0.5-servicing.23166.6 to 7.0.5-servicing.23171.9][5] - **dotnet-user-secrets**: [from 7.0.5-servicing.23166.6 to 7.0.5-servicing.23171.9][5] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 7.0.4 to 7.0.4][3] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 7.0.4 to 7.0.4][3] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 7.0.4-servicing.23117.7 to 7.0.5-servicing.23167.6][6] - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: [from 7.0.5-servicing.23163.9 to 7.0.5-servicing.23171.12][4] - **Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100**: [from 7.0.4 to 7.0.4][7] - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: [from 7.0.5-servicing.23163.9 to 7.0.5-servicing.23171.12][4] - **Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100**: [from 7.0.4 to 7.0.4][7] [2]: https://dev.azure.c... --- NuGet.config | 14 ++++---- eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 24 ++++++------- 3 files changed, 58 insertions(+), 56 deletions(-) diff --git a/NuGet.config b/NuGet.config index ec1aab06f..fb32abc91 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -15,12 +15,13 @@ - + - + + @@ -42,14 +43,15 @@ - + - + - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f22083dab..8a9ac2b49 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 27813f8dc98831931e881b37d1847be3300e76fc + f37d6224b92c338a04689a63d6b38893a5eabfa7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 27813f8dc98831931e881b37d1847be3300e76fc + f37d6224b92c338a04689a63d6b38893a5eabfa7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 27813f8dc98831931e881b37d1847be3300e76fc + f37d6224b92c338a04689a63d6b38893a5eabfa7 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 27813f8dc98831931e881b37d1847be3300e76fc + f37d6224b92c338a04689a63d6b38893a5eabfa7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 71aa107082fd9d77e460bc428c634459ed94a4ab + fb541ff96d21b83022ff1f5213904fd16d180e10 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 71aa107082fd9d77e460bc428c634459ed94a4ab + fb541ff96d21b83022ff1f5213904fd16d180e10 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 71aa107082fd9d77e460bc428c634459ed94a4ab + fb541ff96d21b83022ff1f5213904fd16d180e10 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 71aa107082fd9d77e460bc428c634459ed94a4ab + fb541ff96d21b83022ff1f5213904fd16d180e10 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 71aa107082fd9d77e460bc428c634459ed94a4ab + fb541ff96d21b83022ff1f5213904fd16d180e10 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 71aa107082fd9d77e460bc428c634459ed94a4ab + fb541ff96d21b83022ff1f5213904fd16d180e10 @@ -50,36 +50,36 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 71aa107082fd9d77e460bc428c634459ed94a4ab + fb541ff96d21b83022ff1f5213904fd16d180e10 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 428bf197e6bafee8a5c1ac6e4dca413628c948d9 + 11dd61f1e74fd4ca1a2d922b9cdaf888afa09958 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 428bf197e6bafee8a5c1ac6e4dca413628c948d9 + 11dd61f1e74fd4ca1a2d922b9cdaf888afa09958 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 428bf197e6bafee8a5c1ac6e4dca413628c948d9 + 11dd61f1e74fd4ca1a2d922b9cdaf888afa09958 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 428bf197e6bafee8a5c1ac6e4dca413628c948d9 + 11dd61f1e74fd4ca1a2d922b9cdaf888afa09958 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 428bf197e6bafee8a5c1ac6e4dca413628c948d9 + 11dd61f1e74fd4ca1a2d922b9cdaf888afa09958 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 428bf197e6bafee8a5c1ac6e4dca413628c948d9 + 11dd61f1e74fd4ca1a2d922b9cdaf888afa09958 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 428bf197e6bafee8a5c1ac6e4dca413628c948d9 + 11dd61f1e74fd4ca1a2d922b9cdaf888afa09958 https://github.com/dotnet/test-templates @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 70224ed24df3c936b2b3617a50d9e2fbac0f0e09 + b50c05b6a97a7d33d1507869510bc0591d105222 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 70224ed24df3c936b2b3617a50d9e2fbac0f0e09 + b50c05b6a97a7d33d1507869510bc0591d105222 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 70224ed24df3c936b2b3617a50d9e2fbac0f0e09 + b50c05b6a97a7d33d1507869510bc0591d105222 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 70224ed24df3c936b2b3617a50d9e2fbac0f0e09 + b50c05b6a97a7d33d1507869510bc0591d105222 https://dev.azure.com/dnceng/internal/_git/dotnet-winforms 2f3cabf9537c7d9a9f2f61ea2ad49a4c10ac7d4b - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 0315841ebb89a21c717002224ad9d39f3c21320a + ad3813821b7402477314fb3e4b0eda73c2c8f39f https://github.com/dotnet/fsharp @@ -165,11 +165,11 @@ https://github.com/dotnet/emsdk - 3d7178d836ea32bb7bb51d8d1c714d52fe641ffa + 2a1a284cb9e62959ed261bba6cfc678612fc4559 https://github.com/dotnet/emsdk - 3d7178d836ea32bb7bb51d8d1c714d52fe641ffa + 2a1a284cb9e62959ed261bba6cfc678612fc4559 https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index fd2308d19..9d0e02e47 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,7 +41,7 @@ - 7.0.4-servicing.23117.7 + 7.0.5-servicing.23167.6 @@ -58,11 +58,11 @@ 7.0.5 7.0.5 - 7.0.5-servicing.23166.6 - 7.0.5-servicing.23166.6 - 7.0.5-servicing.23166.6 - 7.0.5-servicing.23166.6 - 7.0.5-servicing.23166.6 + 7.0.5-servicing.23171.9 + 7.0.5-servicing.23171.9 + 7.0.5-servicing.23171.9 + 7.0.5-servicing.23171.9 + 7.0.5-servicing.23171.9 0.2.0 @@ -70,8 +70,8 @@ 7.0.105 - 7.0.105-servicing.23167.11 - 7.0.105-servicing.23167.11 + 7.0.105-servicing.23172.16 + 7.0.105-servicing.23172.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -82,8 +82,8 @@ - 7.0.5-servicing.23163.9 - 7.0.5-servicing.23163.9 + 7.0.5-servicing.23171.12 + 7.0.5-servicing.23171.12 7.0.5 7.0.5 7.0.5 @@ -92,8 +92,8 @@ - 7.0.4-servicing.23118.3 - 7.0.4-servicing.23118.3 + 7.0.4-servicing.23172.5 + 7.0.4-servicing.23172.5 7.0.4 7.0.4