From 02e4f4f5bc2d6027944d5144a3458bad23daa2ec Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 21 Mar 2023 16:52:58 +0000 Subject: [PATCH] Merged PR 30122: [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-runtime This pull request updates the following dependencies [marker]: <> (Begin:1746fd8a-3905-4afb-af8a-08d961c59698) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - **Subscription**: 1746fd8a-3905-4afb-af8a-08d961c59698 - **Build**: 20230320.9 - **Date Produced**: March 21, 2023 12:09:42 AM UTC - **Commit**: 567ff53ac7bd68feedcab3080d5a4c0ee480c928 - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Internal.Runtime.WindowsDesktop.Transport**: [from 6.0.15-servicing.23115.7 to 6.0.16-servicing.23170.9][1] - **Microsoft.NET.Sdk.IL**: [from 6.0.15-servicing.23115.7 to 6.0.16-servicing.23170.9][1] - **Microsoft.NETCore.App.Ref**: [from 6.0.15 to 6.0.16][1] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.15 to 6.0.16][1] - **Microsoft.NETCore.ILAsm**: [from 6.0.15-servicing.23115.7 to 6.0.16-servicing.23170.9][1] - **Microsoft.NETCore.ILDAsm**: [from 6.0.15-servicing.23115.7 to 6.0.16-servicing.23170.9][1] - **Microsoft.NETCore.Platforms**: [from 6.0.8 to 6.0.9][1] - **runtime.win-x64.Microsoft.NETCore.ILAsm**: [from 6.0.15-servicing.23115.7 to 6.0.16-servicing.23170.9][1] - **runtime.win-x86.Microsoft.NETCore.ILAsm**: [from 6.0.15-servicing.23115.7 to 6.0.16-servicing.23170.9][1] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.15-servicing.23115.7 to 6.0.16-servicing.23170.9][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC5edef4b&targetVersion=GC567ff53&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:1746fd8a-3905-4afb-af8a-08d961c59698) --- NuGet.config | 2 ++ eng/Version.Details.xml | 40 ++++++++++++++++++++-------------------- eng/Versions.props | 16 ++++++++-------- global.json | 2 +- 4 files changed, 31 insertions(+), 29 deletions(-) diff --git a/NuGet.config b/NuGet.config index c65d5b02314..c3b03e2e876 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,6 +4,7 @@ + @@ -18,6 +19,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e75374880a2..f5e4a1a9b58 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -7,13 +7,13 @@ 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 - 5edef4b20babd4c3ddac7460e536f86fd0f2d724 + 567ff53ac7bd68feedcab3080d5a4c0ee480c928 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5edef4b20babd4c3ddac7460e536f86fd0f2d724 + 567ff53ac7bd68feedcab3080d5a4c0ee480c928 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -43,21 +43,21 @@ Note: if the Uri is a new place, you will need to add a subscription from that p https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5edef4b20babd4c3ddac7460e536f86fd0f2d724 + 567ff53ac7bd68feedcab3080d5a4c0ee480c928 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5edef4b20babd4c3ddac7460e536f86fd0f2d724 + 567ff53ac7bd68feedcab3080d5a4c0ee480c928 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5edef4b20babd4c3ddac7460e536f86fd0f2d724 + 567ff53ac7bd68feedcab3080d5a4c0ee480c928 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5edef4b20babd4c3ddac7460e536f86fd0f2d724 + 567ff53ac7bd68feedcab3080d5a4c0ee480c928 https://github.com/dotnet/runtime @@ -79,9 +79,9 @@ Note: if the Uri is a new place, you will need to add a subscription from that p https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5edef4b20babd4c3ddac7460e536f86fd0f2d724 + 567ff53ac7bd68feedcab3080d5a4c0ee480c928 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -111,17 +111,17 @@ Note: if the Uri is a new place, you will need to add a subscription from that p https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5edef4b20babd4c3ddac7460e536f86fd0f2d724 + 567ff53ac7bd68feedcab3080d5a4c0ee480c928 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5edef4b20babd4c3ddac7460e536f86fd0f2d724 + 567ff53ac7bd68feedcab3080d5a4c0ee480c928 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5edef4b20babd4c3ddac7460e536f86fd0f2d724 + 567ff53ac7bd68feedcab3080d5a4c0ee480c928 diff --git a/eng/Versions.props b/eng/Versions.props index 68ce09d4fc3..13b43af7669 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,14 +12,14 @@ - 6.0.15-servicing.23115.7 + 6.0.16-servicing.23170.9 6.0.0 6.0.1 6.0.0 6.0.1 6.0.0 5.0.0-preview.7.20320.5 - 6.0.15-servicing.23115.7 + 6.0.16-servicing.23170.9 6.0.1 6.0.2 6.0.0 @@ -27,9 +27,9 @@ 6.0.7 6.0.0 6.0.0 - 6.0.15 - 6.0.15 - 6.0.8 + 6.0.16 + 6.0.16 + 6.0.9 6.0.1 6.0.0 6.0.1 @@ -37,9 +37,9 @@ 6.0.0 6.0.0 6.0.0 - 6.0.15-servicing.23115.7 - 6.0.15-servicing.23115.7 - 6.0.15-servicing.23115.7 + 6.0.16-servicing.23170.9 + 6.0.16-servicing.23170.9 + 6.0.16-servicing.23170.9 diff --git a/global.json b/global.json index eb17c5fe271..e9d1d1b6f5d 100644 --- a/global.json +++ b/global.json @@ -18,7 +18,7 @@ "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.23167.1", "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.23167.1", "FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0", - "Microsoft.NET.Sdk.IL": "6.0.15-servicing.23115.7" + "Microsoft.NET.Sdk.IL": "6.0.16-servicing.23170.9" }, "native-tools": { "cmake": "latest"