From 62d2fa2d075cbcdf0315034f0ff3fd17bc42acaa Mon Sep 17 00:00:00 2001 From: DotNet Bot <dn-bot@microsoft.com> Date: Sat, 18 Feb 2023 19:45:45 +0000 Subject: [PATCH] Merged PR 29705: [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-efcore dnceng/internal/dotnet-runtime This pull request updates the following dependencies [marker]: <> (Begin:7745f62d-e15b-4ba3-39b3-08d960f4ca81) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - **Subscription**: 7745f62d-e15b-4ba3-39b3-08d960f4ca81 - **Build**: 20230215.7 - **Date Produced**: February 16, 2023 3:54:41 AM UTC - **Commit**: 5edef4b20babd4c3ddac7460e536f86fd0f2d724 - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Internal.Runtime.AspNetCore.Transport**: [from 6.0.15-servicing.23114.15 to 6.0.15-servicing.23115.7][8] - **Microsoft.NET.Runtime.MonoAOTCompiler.Task**: [from 6.0.15 to 6.0.15][8] - **Microsoft.NET.Runtime.WebAssembly.Sdk**: [from 6.0.15 to 6.0.15][8] - **Microsoft.NETCore.App.Ref**: [from 6.0.15 to 6.0.15][8] - **Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm**: [from 6.0.15 to 6.0.15][8] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.15 to 6.0.15][8] - **Microsoft.NETCore.BrowserDebugHost.Transport**: [from 6.0.15-servicing.23114.15 to 6.0.15-servicing.23115.7][8] - **Microsoft.NETCore.Platforms**: [from 6.0.8 to 6.0.8][8] - **System.Diagnostics.DiagnosticSource**: [from 6.0.1 to 6.0.1][8] - **System.Net.Http.Json**: [from 6.0.1 to 6.0.1][8] [8]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC22da7ee&targetVersion=GC5edef4b&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:7745f62d-e15b-4ba3-39b3-08d960f4ca81) [marker]: <> (Begin:1ac68a20-28fc-4e11-3a4d-08d961c5a689) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - **Subscription**: 1ac68a20-28fc-4e11-3a4d-08d961c5a689 - **Build**: 20230215.10 - **Date Produced**: February 16, 2023 6:57:13 AM UTC - **Commit**: 7e231732e524f5ddc81f07f1eb5cd153734481c2 - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **dotnet-ef**: [from 6.0.15 to 6.0.15][9] - **Microsoft.EntityFrameworkCore**: [from 6.0.15 to 6.0.15][9] - **Microsoft.EntityFrameworkCore.Design**: [from 6.0.15 to 6.0.15][9] - **Microsoft.EntityFrameworkCore.InMemory**: [from 6.0.15 to 6.0.15][9] - **Microsoft.EntityFrameworkCore.Relational**: [from 6.0.15 to 6.0.15][9] - **Microsoft.EntityFrameworkCore.Sqlite**: [from 6.0.15 to 6.0.15][9] - **Microsoft.EntityFrameworkCore.SqlServer**: [from 6.0.15 to 6.0.15][9] - **Microsoft.EntityFrameworkCore.Tools**: [from 6.0.15 to 6.0.15][9] [9]: https://dev.azure.com/dnceng/internal/_git/dotnet-efcore/branches?baseVersion=GC4a27cac&targetVersion=GC7e23173&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:1ac68a20-28fc-4e11-3a4d-08d961c5a689) --- NuGet.config | 12 ++++-------- eng/Version.Details.xml | 42 ++++++++++++++++++++--------------------- eng/Versions.props | 6 +++--- 3 files changed, 28 insertions(+), 32 deletions(-) diff --git a/NuGet.config b/NuGet.config index 7915e374836..c9d0181e19d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,12 +4,10 @@ <clear /> <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.--> <!-- Begin: Package sources from dotnet-runtime --> - <add key="darc-int-dotnet-runtime-9b4f0e3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-9b4f0e3a/nuget/v3/index.json" /> - <add key="darc-int-dotnet-runtime-2a90daa" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-2a90daa2/nuget/v3/index.json" /> - <add key="darc-int-dotnet-runtime-2a90daa-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-2a90daa2-1/nuget/v3/index.json" /> + <add key="darc-int-dotnet-runtime-5edef4b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-5edef4b2/nuget/v3/index.json" /> <!-- End: Package sources from dotnet-runtime --> <!-- Begin: Package sources from dotnet-efcore --> - <add key="darc-int-dotnet-efcore-a7e982e" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-a7e982eb/nuget/v3/index.json" /> + <add key="darc-int-dotnet-efcore-7e23173" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-7e231732/nuget/v3/index.json" /> <!-- End: Package sources from dotnet-efcore --> <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.--> <add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" /> @@ -27,12 +25,10 @@ <clear /> <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.--> <!-- Begin: Package sources from dotnet-efcore --> - <add key="darc-int-dotnet-efcore-a7e982e" value="true" /> + <add key="darc-int-dotnet-efcore-7e23173" value="true" /> <!-- End: Package sources from dotnet-efcore --> <!-- Begin: Package sources from dotnet-runtime --> - <add key="darc-int-dotnet-runtime-2a90daa-1" value="true" /> - <add key="darc-int-dotnet-runtime-2a90daa" value="true" /> - <add key="darc-int-dotnet-runtime-9b4f0e3" value="true" /> + <add key="darc-int-dotnet-runtime-5edef4b" value="true" /> <!-- End: Package sources from dotnet-runtime --> <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.--> </disabledPackageSources> diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7d79ab4add2..d9e2a29100f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -11,35 +11,35 @@ <ProductDependencies> <Dependency Name="dotnet-ef" Version="6.0.15"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri> - <Sha>a7e982eb9301f615a9125491560916b0840e076b</Sha> + <Sha>7e231732e524f5ddc81f07f1eb5cd153734481c2</Sha> </Dependency> <Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.15"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri> - <Sha>a7e982eb9301f615a9125491560916b0840e076b</Sha> + <Sha>7e231732e524f5ddc81f07f1eb5cd153734481c2</Sha> </Dependency> <Dependency Name="Microsoft.EntityFrameworkCore.Relational" Version="6.0.15"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri> - <Sha>a7e982eb9301f615a9125491560916b0840e076b</Sha> + <Sha>7e231732e524f5ddc81f07f1eb5cd153734481c2</Sha> </Dependency> <Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.15"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri> - <Sha>a7e982eb9301f615a9125491560916b0840e076b</Sha> + <Sha>7e231732e524f5ddc81f07f1eb5cd153734481c2</Sha> </Dependency> <Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.15"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri> - <Sha>a7e982eb9301f615a9125491560916b0840e076b</Sha> + <Sha>7e231732e524f5ddc81f07f1eb5cd153734481c2</Sha> </Dependency> <Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="6.0.15"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri> - <Sha>a7e982eb9301f615a9125491560916b0840e076b</Sha> + <Sha>7e231732e524f5ddc81f07f1eb5cd153734481c2</Sha> </Dependency> <Dependency Name="Microsoft.EntityFrameworkCore" Version="6.0.15"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri> - <Sha>a7e982eb9301f615a9125491560916b0840e076b</Sha> + <Sha>7e231732e524f5ddc81f07f1eb5cd153734481c2</Sha> </Dependency> <Dependency Name="Microsoft.EntityFrameworkCore.Design" Version="6.0.15"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri> - <Sha>a7e982eb9301f615a9125491560916b0840e076b</Sha> + <Sha>7e231732e524f5ddc81f07f1eb5cd153734481c2</Sha> </Dependency> <Dependency Name="Microsoft.Extensions.Caching.Abstractions" Version="6.0.0"> <Uri>https://github.com/dotnet/runtime</Uri> @@ -177,13 +177,13 @@ <Uri>https://github.com/dotnet/runtime</Uri> <Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha> </Dependency> - <Dependency Name="Microsoft.Internal.Runtime.AspNetCore.Transport" Version="6.0.15-servicing.23114.6"> + <Dependency Name="Microsoft.Internal.Runtime.AspNetCore.Transport" Version="6.0.15-servicing.23115.7"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>9b4f0e3a21f3b5ce1d8bb2c31cd40ac08bae4210</Sha> + <Sha>5edef4b20babd4c3ddac7460e536f86fd0f2d724</Sha> </Dependency> <Dependency Name="System.Diagnostics.DiagnosticSource" Version="6.0.1"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>9b4f0e3a21f3b5ce1d8bb2c31cd40ac08bae4210</Sha> + <Sha>5edef4b20babd4c3ddac7460e536f86fd0f2d724</Sha> </Dependency> <Dependency Name="System.Diagnostics.EventLog" Version="6.0.0"> <Uri>https://github.com/dotnet/runtime</Uri> @@ -199,7 +199,7 @@ </Dependency> <Dependency Name="System.Net.Http.Json" Version="6.0.1"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>9b4f0e3a21f3b5ce1d8bb2c31cd40ac08bae4210</Sha> + <Sha>5edef4b20babd4c3ddac7460e536f86fd0f2d724</Sha> </Dependency> <Dependency Name="System.Net.Http.WinHttpHandler" Version="6.0.1"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> @@ -247,15 +247,15 @@ </Dependency> <Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.15"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>9b4f0e3a21f3b5ce1d8bb2c31cd40ac08bae4210</Sha> + <Sha>5edef4b20babd4c3ddac7460e536f86fd0f2d724</Sha> </Dependency> <Dependency Name="Microsoft.NET.Runtime.MonoAOTCompiler.Task" Version="6.0.15"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>9b4f0e3a21f3b5ce1d8bb2c31cd40ac08bae4210</Sha> + <Sha>5edef4b20babd4c3ddac7460e536f86fd0f2d724</Sha> </Dependency> <Dependency Name="Microsoft.NET.Runtime.WebAssembly.Sdk" Version="6.0.15"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>9b4f0e3a21f3b5ce1d8bb2c31cd40ac08bae4210</Sha> + <Sha>5edef4b20babd4c3ddac7460e536f86fd0f2d724</Sha> </Dependency> <!-- Win-x64 is used here because we have picked an arbitrary runtime identifier to flow the version of the latest NETCore.App runtime. @@ -263,22 +263,22 @@ --> <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.15"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>9b4f0e3a21f3b5ce1d8bb2c31cd40ac08bae4210</Sha> + <Sha>5edef4b20babd4c3ddac7460e536f86fd0f2d724</Sha> </Dependency> <Dependency Name="Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm" Version="6.0.15"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>9b4f0e3a21f3b5ce1d8bb2c31cd40ac08bae4210</Sha> + <Sha>5edef4b20babd4c3ddac7460e536f86fd0f2d724</Sha> </Dependency> - <Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="6.0.15-servicing.23114.6"> + <Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="6.0.15-servicing.23115.7"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>9b4f0e3a21f3b5ce1d8bb2c31cd40ac08bae4210</Sha> + <Sha>5edef4b20babd4c3ddac7460e536f86fd0f2d724</Sha> </Dependency> </ProductDependencies> <ToolsetDependencies> <!-- Listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 --> - <Dependency Name="Microsoft.NETCore.Platforms" Version="6.0.7"> + <Dependency Name="Microsoft.NETCore.Platforms" Version="6.0.8"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>943474ca16db7c65ba6cff4a89c3ebd219dde3e5</Sha> + <Sha>5edef4b20babd4c3ddac7460e536f86fd0f2d724</Sha> </Dependency> <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.23114.5"> <Uri>https://github.com/dotnet/arcade</Uri> diff --git a/eng/Versions.props b/eng/Versions.props index d6bc3c66d02..271e72b3007 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -68,7 +68,7 @@ <MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>6.0.15</MicrosoftNETRuntimeMonoAOTCompilerTaskVersion> <MicrosoftNETRuntimeWebAssemblySdkVersion>6.0.15</MicrosoftNETRuntimeWebAssemblySdkVersion> <MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>6.0.15</MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion> - <MicrosoftNETCoreBrowserDebugHostTransportVersion>6.0.15-servicing.23114.6</MicrosoftNETCoreBrowserDebugHostTransportVersion> + <MicrosoftNETCoreBrowserDebugHostTransportVersion>6.0.15-servicing.23115.7</MicrosoftNETCoreBrowserDebugHostTransportVersion> <MicrosoftExtensionsCachingAbstractionsVersion>6.0.0</MicrosoftExtensionsCachingAbstractionsVersion> <MicrosoftExtensionsCachingMemoryVersion>6.0.1</MicrosoftExtensionsCachingMemoryVersion> <MicrosoftExtensionsConfigurationAbstractionsVersion>6.0.0</MicrosoftExtensionsConfigurationAbstractionsVersion> @@ -103,7 +103,7 @@ <MicrosoftExtensionsOptionsDataAnnotationsVersion>6.0.0</MicrosoftExtensionsOptionsDataAnnotationsVersion> <MicrosoftExtensionsOptionsVersion>6.0.0</MicrosoftExtensionsOptionsVersion> <MicrosoftExtensionsPrimitivesVersion>6.0.0</MicrosoftExtensionsPrimitivesVersion> - <MicrosoftInternalRuntimeAspNetCoreTransportVersion>6.0.15-servicing.23114.6</MicrosoftInternalRuntimeAspNetCoreTransportVersion> + <MicrosoftInternalRuntimeAspNetCoreTransportVersion>6.0.15-servicing.23115.7</MicrosoftInternalRuntimeAspNetCoreTransportVersion> <SystemDiagnosticsDiagnosticSourceVersion>6.0.1</SystemDiagnosticsDiagnosticSourceVersion> <SystemDiagnosticsEventLogVersion>6.0.0</SystemDiagnosticsEventLogVersion> <SystemDirectoryServicesProtocolsVersion>6.0.1</SystemDirectoryServicesProtocolsVersion> @@ -120,7 +120,7 @@ <SystemTextJsonVersion>6.0.7</SystemTextJsonVersion> <SystemThreadingChannelsVersion>6.0.0</SystemThreadingChannelsVersion> <!-- Only listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 --> - <MicrosoftNETCorePlatformsVersion>6.0.7</MicrosoftNETCorePlatformsVersion> + <MicrosoftNETCorePlatformsVersion>6.0.8</MicrosoftNETCorePlatformsVersion> <!-- Packages from dotnet/efcore --> <dotnetefVersion>6.0.15</dotnetefVersion> <MicrosoftEntityFrameworkCoreInMemoryVersion>6.0.15</MicrosoftEntityFrameworkCoreInMemoryVersion> -- GitLab