From cb12e458e05385ddde3f1172aa1a9978ac9bc896 Mon Sep 17 00:00:00 2001 From: DotNet Bot <dn-bot@microsoft.com> Date: Mon, 17 Oct 2022 20:33:18 +0000 Subject: [PATCH] Merged PR 26653: [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-efcore dnceng/internal/dotnet-runtime This pull request updates the following dependencies [marker]: <> (Begin:1ac68a20-28fc-4e11-3a4d-08d961c5a689) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - **Subscription**: 1ac68a20-28fc-4e11-3a4d-08d961c5a689 - **Build**: 20221013.2 - **Date Produced**: October 13, 2022 8:21:56 PM UTC - **Commit**: 41de76292bf32718493a641fff49252c68fdbe53 - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **dotnet-ef**: [from 6.0.11 to 6.0.11][2] - **Microsoft.EntityFrameworkCore**: [from 6.0.11 to 6.0.11][2] - **Microsoft.EntityFrameworkCore.Design**: [from 6.0.11 to 6.0.11][2] - **Microsoft.EntityFrameworkCore.InMemory**: [from 6.0.11 to 6.0.11][2] - **Microsoft.EntityFrameworkCore.Relational**: [from 6.0.11 to 6.0.11][2] - **Microsoft.EntityFrameworkCore.Sqlite**: [from 6.0.11 to 6.0.11][2] - **Microsoft.EntityFrameworkCore.SqlServer**: [from 6.0.11 to 6.0.11][2] - **Microsoft.EntityFrameworkCore.Tools**: [from 6.0.11 to 6.0.11][2] [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-efcore/branches?baseVersion=GC1c3cdab&targetVersion=GC41de762&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:1ac68a20-28fc-4e11-3a4d-08d961c5a689) [marker]: <> (Begin:7745f62d-e15b-4ba3-39b3-08d960f4ca81) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - **Subscription**: 7745f62d-e15b-4ba3-39b3-08d960f4ca81 - **Build**: 20221014.6 - **Date Produced**: October 14, 2022 9:40:37 PM UTC - **Commit**: c672e901c8819a22123da5c0cb7295d914e70627 - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Extensions.Logging.Abstractions**: [from 6.0.3 to 6.0.3][3] - **Microsoft.Internal.Runtime.AspNetCore.Transport**: [from 6.0.11-servicing.22507.4 to 6.0.11-servicing.22514.6][3] - **Microsoft.NET.Runtime.MonoAOTCompiler.Task**: [from 6.0.11 to 6.0.11][3] - **Microsoft.NET.Runtime.WebAssembly.Sdk**: [from 6.0.11 to 6.0.11][3] - **Microsoft.NETCore.App.Ref**: [from 6.0.11 to 6.0.11][3] - **Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm**: [from 6.0.11 to 6.0.11][3] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][3] - **Microsoft.NETCore.BrowserDebugHost.Transport**: [from 6.0.11-servicing.22507.4 to 6.0.11-servicing.22514.6][3] - **Microsoft.NETCore.Platforms**: [from 6.0.6 to 6.0.7][4] - **System.Text.Json**: [from 6.0.7 to 6.0.7][3] [3]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GCdd7c928&targetVersion=GCc672e90&_a=files [4]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC5a400c2&targetVersion=GCc672e90&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:7745f62d-e15b-4ba3-39b3-08d960f4ca81) --- NuGet.config | 4 ++++ eng/Version.Details.xml | 42 ++++++++++++++++++++--------------------- eng/Versions.props | 6 +++--- 3 files changed, 28 insertions(+), 24 deletions(-) diff --git a/NuGet.config b/NuGet.config index 4b821f80099..006438aab22 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,8 +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-c672e90" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-c672e901/nuget/v3/index.json" /> <!-- End: Package sources from dotnet-runtime --> <!-- Begin: Package sources from dotnet-efcore --> + <add key="darc-int-dotnet-efcore-41de762" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-41de7629/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" /> @@ -25,8 +27,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-41de762" value="true" /> <!-- End: Package sources from dotnet-efcore --> <!-- Begin: Package sources from dotnet-runtime --> + <add key="darc-int-dotnet-runtime-c672e90" 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 be2359a4b0d..01792edf12c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -11,35 +11,35 @@ <ProductDependencies> <Dependency Name="dotnet-ef" Version="6.0.11"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri> - <Sha>1c3cdab61c6c0051c7bdc2006d7a0d18641724af</Sha> + <Sha>41de76292bf32718493a641fff49252c68fdbe53</Sha> </Dependency> <Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.11"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri> - <Sha>1c3cdab61c6c0051c7bdc2006d7a0d18641724af</Sha> + <Sha>41de76292bf32718493a641fff49252c68fdbe53</Sha> </Dependency> <Dependency Name="Microsoft.EntityFrameworkCore.Relational" Version="6.0.11"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri> - <Sha>1c3cdab61c6c0051c7bdc2006d7a0d18641724af</Sha> + <Sha>41de76292bf32718493a641fff49252c68fdbe53</Sha> </Dependency> <Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.11"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri> - <Sha>1c3cdab61c6c0051c7bdc2006d7a0d18641724af</Sha> + <Sha>41de76292bf32718493a641fff49252c68fdbe53</Sha> </Dependency> <Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.11"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri> - <Sha>1c3cdab61c6c0051c7bdc2006d7a0d18641724af</Sha> + <Sha>41de76292bf32718493a641fff49252c68fdbe53</Sha> </Dependency> <Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="6.0.11"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri> - <Sha>1c3cdab61c6c0051c7bdc2006d7a0d18641724af</Sha> + <Sha>41de76292bf32718493a641fff49252c68fdbe53</Sha> </Dependency> <Dependency Name="Microsoft.EntityFrameworkCore" Version="6.0.11"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri> - <Sha>1c3cdab61c6c0051c7bdc2006d7a0d18641724af</Sha> + <Sha>41de76292bf32718493a641fff49252c68fdbe53</Sha> </Dependency> <Dependency Name="Microsoft.EntityFrameworkCore.Design" Version="6.0.11"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri> - <Sha>1c3cdab61c6c0051c7bdc2006d7a0d18641724af</Sha> + <Sha>41de76292bf32718493a641fff49252c68fdbe53</Sha> </Dependency> <Dependency Name="Microsoft.Extensions.Caching.Abstractions" Version="6.0.0"> <Uri>https://github.com/dotnet/runtime</Uri> @@ -131,7 +131,7 @@ </Dependency> <Dependency Name="Microsoft.Extensions.Logging.Abstractions" Version="6.0.3"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>dd7c928350a2f3f31dbf156ce308f9077a3715e4</Sha> + <Sha>c672e901c8819a22123da5c0cb7295d914e70627</Sha> </Dependency> <Dependency Name="Microsoft.Extensions.Logging.Configuration" Version="6.0.0"> <Uri>https://github.com/dotnet/runtime</Uri> @@ -177,9 +177,9 @@ <Uri>https://github.com/dotnet/runtime</Uri> <Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha> </Dependency> - <Dependency Name="Microsoft.Internal.Runtime.AspNetCore.Transport" Version="6.0.11-servicing.22507.4"> + <Dependency Name="Microsoft.Internal.Runtime.AspNetCore.Transport" Version="6.0.11-servicing.22514.6"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>dd7c928350a2f3f31dbf156ce308f9077a3715e4</Sha> + <Sha>c672e901c8819a22123da5c0cb7295d914e70627</Sha> </Dependency> <Dependency Name="System.Diagnostics.DiagnosticSource" Version="6.0.0"> <Uri>https://github.com/dotnet/runtime</Uri> @@ -235,7 +235,7 @@ </Dependency> <Dependency Name="System.Text.Json" Version="6.0.7"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>dd7c928350a2f3f31dbf156ce308f9077a3715e4</Sha> + <Sha>c672e901c8819a22123da5c0cb7295d914e70627</Sha> </Dependency> <Dependency Name="System.Threading.Channels" Version="6.0.0"> <Uri>https://github.com/dotnet/runtime</Uri> @@ -247,15 +247,15 @@ </Dependency> <Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.11"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>dd7c928350a2f3f31dbf156ce308f9077a3715e4</Sha> + <Sha>c672e901c8819a22123da5c0cb7295d914e70627</Sha> </Dependency> <Dependency Name="Microsoft.NET.Runtime.MonoAOTCompiler.Task" Version="6.0.11"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>dd7c928350a2f3f31dbf156ce308f9077a3715e4</Sha> + <Sha>c672e901c8819a22123da5c0cb7295d914e70627</Sha> </Dependency> <Dependency Name="Microsoft.NET.Runtime.WebAssembly.Sdk" Version="6.0.11"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>dd7c928350a2f3f31dbf156ce308f9077a3715e4</Sha> + <Sha>c672e901c8819a22123da5c0cb7295d914e70627</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.11"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>dd7c928350a2f3f31dbf156ce308f9077a3715e4</Sha> + <Sha>c672e901c8819a22123da5c0cb7295d914e70627</Sha> </Dependency> <Dependency Name="Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm" Version="6.0.11"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>dd7c928350a2f3f31dbf156ce308f9077a3715e4</Sha> + <Sha>c672e901c8819a22123da5c0cb7295d914e70627</Sha> </Dependency> - <Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="6.0.11-servicing.22507.4"> + <Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="6.0.11-servicing.22514.6"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>dd7c928350a2f3f31dbf156ce308f9077a3715e4</Sha> + <Sha>c672e901c8819a22123da5c0cb7295d914e70627</Sha> </Dependency> </ProductDependencies> <ToolsetDependencies> <!-- Listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 --> - <Dependency Name="Microsoft.NETCore.Platforms" Version="6.0.6"> + <Dependency Name="Microsoft.NETCore.Platforms" Version="6.0.7"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>5a400c212afdf8e675c9a1d38442e6d2f19f7b74</Sha> + <Sha>c672e901c8819a22123da5c0cb7295d914e70627</Sha> </Dependency> <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.22512.3"> <Uri>https://github.com/dotnet/arcade</Uri> diff --git a/eng/Versions.props b/eng/Versions.props index 293f9afaab6..8df58a1efb7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -68,7 +68,7 @@ <MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>6.0.11</MicrosoftNETRuntimeMonoAOTCompilerTaskVersion> <MicrosoftNETRuntimeWebAssemblySdkVersion>6.0.11</MicrosoftNETRuntimeWebAssemblySdkVersion> <MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>6.0.11</MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion> - <MicrosoftNETCoreBrowserDebugHostTransportVersion>6.0.11-servicing.22507.4</MicrosoftNETCoreBrowserDebugHostTransportVersion> + <MicrosoftNETCoreBrowserDebugHostTransportVersion>6.0.11-servicing.22514.6</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.11-servicing.22507.4</MicrosoftInternalRuntimeAspNetCoreTransportVersion> + <MicrosoftInternalRuntimeAspNetCoreTransportVersion>6.0.11-servicing.22514.6</MicrosoftInternalRuntimeAspNetCoreTransportVersion> <SystemDiagnosticsDiagnosticSourceVersion>6.0.0</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.6</MicrosoftNETCorePlatformsVersion> + <MicrosoftNETCorePlatformsVersion>6.0.7</MicrosoftNETCorePlatformsVersion> <!-- Packages from dotnet/efcore --> <dotnetefVersion>6.0.11</dotnetefVersion> <MicrosoftEntityFrameworkCoreInMemoryVersion>6.0.11</MicrosoftEntityFrameworkCoreInMemoryVersion> -- GitLab