From 2f3cabf9537c7d9a9f2f61ea2ad49a4c10ac7d4b Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 17 Feb 2023 20:10:19 +0000 Subject: [PATCH] Merged PR 29711: [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**: 20230215.8 - **Date Produced**: February 17, 2023 5:30:27 PM UTC - **Commit**: 0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4 - **Branch**: refs/heads/internal/release/7.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Internal.Runtime.WindowsDesktop.Transport**: [from 7.0.4-servicing.23114.5 to 7.0.4-servicing.23115.8][1] - **Microsoft.NET.Sdk.IL**: [from 7.0.4-servicing.23114.5 to 7.0.4-servicing.23115.8][1] - **Microsoft.NETCore.App.Ref**: [from 7.0.4 to 7.0.4][1] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 7.0.4 to 7.0.4][1] - **Microsoft.NETCore.ILAsm**: [from 7.0.4-servicing.23114.5 to 7.0.4-servicing.23115.8][1] - **Microsoft.NETCore.ILDAsm**: [from 7.0.4-servicing.23114.5 to 7.0.4-servicing.23115.8][1] - **Microsoft.NETCore.Platforms**: [from 7.0.0 to 7.0.1][2] - **runtime.win-x64.Microsoft.NETCore.ILAsm**: [from 7.0.4-servicing.23114.5 to 7.0.4-servicing.23115.8][1] - **runtime.win-x86.Microsoft.NETCore.ILAsm**: [from 7.0.4-servicing.23114.5 to 7.0.4-servicing.23115.8][1] - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: [from 7.0.4-servicing.23114.5 to 7.0.4-servicing.23115.8][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GCdcb489a&targetVersion=GC0a396ac&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GCd099f07&targetVersion=GC0a396ac&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:25f6e48a-ea28-4cf9-40e5-08da7ef5fc68) --- NuGet.config | 8 ++------ eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 12 ++++++------ global.json | 2 +- 4 files changed, 27 insertions(+), 31 deletions(-) diff --git a/NuGet.config b/NuGet.config index ce1bb46b190..e238457cb0b 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 38444f43b8d..3c710bea1fa 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 - dcb489a49c7b4a229e3e6d02d393a48105742c06 + 0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d099f075e45d2aa6007a22b71b45a08758559f80 + 0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4 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 - dcb489a49c7b4a229e3e6d02d393a48105742c06 + 0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - dcb489a49c7b4a229e3e6d02d393a48105742c06 + 0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - dcb489a49c7b4a229e3e6d02d393a48105742c06 + 0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - dcb489a49c7b4a229e3e6d02d393a48105742c06 + 0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4 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 - dcb489a49c7b4a229e3e6d02d393a48105742c06 + 0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -117,15 +117,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 - dcb489a49c7b4a229e3e6d02d393a48105742c06 + 0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - dcb489a49c7b4a229e3e6d02d393a48105742c06 + 0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - dcb489a49c7b4a229e3e6d02d393a48105742c06 + 0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4 diff --git a/eng/Versions.props b/eng/Versions.props index 717127331e6..4d1840f0c7e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -14,14 +14,14 @@ - 7.0.4-servicing.23114.5 + 7.0.4-servicing.23115.8 7.0.0 7.0.1 7.0.0 7.0.1 7.0.0 5.0.0-preview.7.20320.5 - 7.0.4-servicing.23114.5 + 7.0.4-servicing.23115.8 7.0.0 7.0.1 7.0.1 @@ -31,7 +31,7 @@ 7.0.0 7.0.4 7.0.4 - 7.0.0 + 7.0.1 7.0.0 7.0.0 7.0.0 @@ -39,9 +39,9 @@ 7.0.0 7.0.0 7.0.0 - 7.0.4-servicing.23114.5 - 7.0.4-servicing.23114.5 - 7.0.4-servicing.23114.5 + 7.0.4-servicing.23115.8 + 7.0.4-servicing.23115.8 + 7.0.4-servicing.23115.8 diff --git a/global.json b/global.json index a9d4b7d43bf..4c10a42cf59 100644 --- a/global.json +++ b/global.json @@ -18,7 +18,7 @@ "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23114.3", "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.23114.3", "FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0", - "Microsoft.NET.Sdk.IL": "7.0.4-servicing.23114.5" + "Microsoft.NET.Sdk.IL": "7.0.4-servicing.23115.8" }, "native-tools": { "cmake": "3"