From 3d504675f930028236a0f09e47c900ad48bd3d6e Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 18 Jan 2024 06:51:50 +0000 Subject: [PATCH] Merged PR 36580: [internal/release/7.0] Update dependencies from dnceng/internal/dotnet-runtime This pull request updates the following dependencies [marker]: <> (Begin:25f6e48a-ea28-4cf9-40e5-08da7ef5fc68) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - **Subscription**: 25f6e48a-ea28-4cf9-40e5-08da7ef5fc68 - **Build**: 20240116.29 - **Date Produced**: January 18, 2024 12:57:58 AM UTC - **Commit**: 567edafe6106e6b769c64f6a2ed876190baa642a - **Branch**: refs/heads/internal/release/7.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Internal.Runtime.WindowsDesktop.Transport**: [from 7.0.15-servicing.23572.26 to 7.0.16-servicing.24066.29][1] - **Microsoft.NET.Sdk.IL**: [from 7.0.15-servicing.23572.26 to 7.0.16-servicing.24066.29][1] - **Microsoft.NETCore.App.Ref**: [from 7.0.15 to 7.0.16][1] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 7.0.15 to 7.0.16][1] - **Microsoft.NETCore.ILAsm**: [from 7.0.15-servicing.23572.26 to 7.0.16-servicing.24066.29][1] - **Microsoft.NETCore.ILDAsm**: [from 7.0.15-servicing.23572.26 to 7.0.16-servicing.24066.29][1] - **runtime.win-x64.Microsoft.NETCore.ILAsm**: [from 7.0.15-servicing.23572.26 to 7.0.16-servicing.24066.29][1] - **runtime.win-x86.Microsoft.NETCore.ILAsm**: [from 7.0.15-servicing.23572.26 to 7.0.16-servicing.24066.29][1] - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: [from 7.0.15-servicing.23572.26 to 7.0.16-servicing.24066.29][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC8f4568cdaa2f9654fd133a17cd2dcc55b5f42455&targetVersion=GC567edafe6106e6b769c64f6a2ed876190baa642a&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:25f6e48a-ea28-4cf9-40e5-08da7ef5fc68) --- NuGet.config | 8 ++------ eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 14 +++++++------- global.json | 2 +- 4 files changed, 28 insertions(+), 32 deletions(-) diff --git a/NuGet.config b/NuGet.config index d4791d794ee..781b68ec8f3 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,9 +4,7 @@ - - - + @@ -21,9 +19,7 @@ - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fc1271fbf7b..08a7669a391 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -7,9 +7,9 @@ Note: if the Uri is a new place, you will need to add a subscription from that p --> - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 + 567edafe6106e6b769c64f6a2ed876190baa642a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -47,21 +47,21 @@ Note: if the Uri is a new place, you will need to add a subscription from that p https://dev.azure.com/dnceng/internal/_git/dotnet-runtime d099f075e45d2aa6007a22b71b45a08758559f80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 + 567edafe6106e6b769c64f6a2ed876190baa642a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 + 567edafe6106e6b769c64f6a2ed876190baa642a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 + 567edafe6106e6b769c64f6a2ed876190baa642a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 + 567edafe6106e6b769c64f6a2ed876190baa642a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -83,9 +83,9 @@ Note: if the Uri is a new place, you will need to add a subscription from that p https://dev.azure.com/dnceng/internal/_git/dotnet-runtime d099f075e45d2aa6007a22b71b45a08758559f80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 + 567edafe6106e6b769c64f6a2ed876190baa642a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -115,17 +115,17 @@ Note: if the Uri is a new place, you will need to add a subscription from that p https://dev.azure.com/dnceng/internal/_git/dotnet-runtime d099f075e45d2aa6007a22b71b45a08758559f80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 + 567edafe6106e6b769c64f6a2ed876190baa642a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 + 567edafe6106e6b769c64f6a2ed876190baa642a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 + 567edafe6106e6b769c64f6a2ed876190baa642a diff --git a/eng/Versions.props b/eng/Versions.props index 7a617c00a4c..8282056fbb3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -14,14 +14,14 @@ - 7.0.15-servicing.23572.26 + 7.0.16-servicing.24066.29 7.0.0 7.0.1 7.0.0 7.0.1 7.0.0 5.0.0-preview.7.20320.5 - 7.0.15-servicing.23572.26 + 7.0.16-servicing.24066.29 7.0.0 7.0.2 7.0.1 @@ -29,8 +29,8 @@ 7.0.4 7.0.1 7.0.0 - 7.0.15 - 7.0.15 + 7.0.16 + 7.0.16 7.0.4 7.0.0 7.0.0 @@ -39,9 +39,9 @@ 7.0.0 7.0.0 7.0.0 - 7.0.15-servicing.23572.26 - 7.0.15-servicing.23572.26 - 7.0.15-servicing.23572.26 + 7.0.16-servicing.24066.29 + 7.0.16-servicing.24066.29 + 7.0.16-servicing.24066.29 diff --git a/global.json b/global.json index f1ed3717e91..bbf69036f81 100644 --- a/global.json +++ b/global.json @@ -18,7 +18,7 @@ "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24059.5", "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.24059.5", "FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0", - "Microsoft.NET.Sdk.IL": "7.0.15-servicing.23572.26" + "Microsoft.NET.Sdk.IL": "7.0.16-servicing.24066.29" }, "native-tools": { "cmake": "3"