From c309ca06b81112f5e42cc9ca6f8bf0c4a772be6b Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 5 Dec 2023 21:39:00 +0000 Subject: [PATCH] Merged PR 35823: [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**: 20231205.8 - **Date Produced**: December 5, 2023 9:01:32 PM UTC - **Commit**: dc45e96840243b203b13e61952230e225d2aac52 - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Internal.Runtime.WindowsDesktop.Transport**: [from 6.0.26-servicing.23572.29 to 6.0.26-servicing.23605.8][1] - **Microsoft.NET.Sdk.IL**: [from 6.0.26-servicing.23572.29 to 6.0.26-servicing.23605.8][1] - **Microsoft.NETCore.App.Ref**: [from 6.0.26 to 6.0.26][1] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.26 to 6.0.26][1] - **Microsoft.NETCore.ILAsm**: [from 6.0.26-servicing.23572.29 to 6.0.26-servicing.23605.8][1] - **Microsoft.NETCore.ILDAsm**: [from 6.0.26-servicing.23572.29 to 6.0.26-servicing.23605.8][1] - **runtime.win-x64.Microsoft.NETCore.ILAsm**: [from 6.0.26-servicing.23572.29 to 6.0.26-servicing.23605.8][1] - **runtime.win-x86.Microsoft.NETCore.ILAsm**: [from 6.0.26-servicing.23572.29 to 6.0.26-servicing.23605.8][1] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.26-servicing.23572.29 to 6.0.26-servicing.23605.8][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC965a793efc&targetVersion=GCdc45e96840&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:1746fd8a-3905-4afb-af8a-08d961c59698) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 10 +++++----- global.json | 2 +- 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/NuGet.config b/NuGet.config index e7940c28d6e..5300a77ad0c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + @@ -19,7 +19,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b1b8543323f..16ca8020e2a 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 - 965a793efc765ddbea3c43e43c13b8e956b61946 + dc45e96840243b203b13e61952230e225d2aac52 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 - 965a793efc765ddbea3c43e43c13b8e956b61946 + dc45e96840243b203b13e61952230e225d2aac52 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 965a793efc765ddbea3c43e43c13b8e956b61946 + dc45e96840243b203b13e61952230e225d2aac52 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 965a793efc765ddbea3c43e43c13b8e956b61946 + dc45e96840243b203b13e61952230e225d2aac52 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 965a793efc765ddbea3c43e43c13b8e956b61946 + dc45e96840243b203b13e61952230e225d2aac52 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 - 965a793efc765ddbea3c43e43c13b8e956b61946 + dc45e96840243b203b13e61952230e225d2aac52 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -113,15 +113,15 @@ 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 - 965a793efc765ddbea3c43e43c13b8e956b61946 + dc45e96840243b203b13e61952230e225d2aac52 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 965a793efc765ddbea3c43e43c13b8e956b61946 + dc45e96840243b203b13e61952230e225d2aac52 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 965a793efc765ddbea3c43e43c13b8e956b61946 + dc45e96840243b203b13e61952230e225d2aac52 diff --git a/eng/Versions.props b/eng/Versions.props index a5381e990bf..a4695f34db8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,14 +12,14 @@ - 6.0.26-servicing.23572.29 + 6.0.26-servicing.23605.8 6.0.0 6.0.1 6.0.0 6.0.1 6.0.0 5.0.0-preview.7.20320.5 - 6.0.26-servicing.23572.29 + 6.0.26-servicing.23605.8 6.0.1 6.0.3 6.0.0 @@ -37,9 +37,9 @@ 6.0.0 6.0.0 6.0.0 - 6.0.26-servicing.23572.29 - 6.0.26-servicing.23572.29 - 6.0.26-servicing.23572.29 + 6.0.26-servicing.23605.8 + 6.0.26-servicing.23605.8 + 6.0.26-servicing.23605.8 diff --git a/global.json b/global.json index dbd827c9f4a..5bac49df198 100644 --- a/global.json +++ b/global.json @@ -18,7 +18,7 @@ "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.23517.3", "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.23517.3", "FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0", - "Microsoft.NET.Sdk.IL": "6.0.26-servicing.23572.29" + "Microsoft.NET.Sdk.IL": "6.0.26-servicing.23605.8" }, "native-tools": { "cmake": "latest"