diff options
author | DotNet Bot <dn-bot@microsoft.com> | 2021-11-18 06:10:46 +0300 |
---|---|---|
committer | Matt Mitchell <mmitche@microsoft.com> | 2021-11-18 06:10:46 +0300 |
commit | 4e7d976438b0fc17f435804e801d5d68d193ec33 (patch) | |
tree | f7b88783f040b2d1fa04d3b11ebfe9d924163e0f | |
parent | 156759c38d7ba412aa6a5a7d3dcd5e315e079c77 (diff) |
Merged PR 19979: [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-runtime dnceng/internal/dotnet-efcorev6.0.1
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**: 20211117.5
- **Date Produced**: November 17, 2021 8:19:12 PM UTC
- **Commit**: 3a25a7f1cc446b60678ed25c9d829420d6321eba
- **Branch**: refs/heads/internal/release/6.0
[DependencyUpdate]: <> (Begin)
- **Updates**:
- **Microsoft.NETCore.Platforms**: [from 6.0.1 to 6.0.1][1]
- **Microsoft.NETCore.BrowserDebugHost.Transport**: [from 6.0.1-servicing.21565.18 to 6.0.1-servicing.21567.5][1]
- **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.1 to 6.0.1][1]
- **System.Text.Json**: [from 6.0.0 to 6.0.1][2]
- **System.IO.Pipelines**: [from 6.0.1 to 6.0.1][1]
- **Microsoft.NETCore.App.Ref**: [from 6.0.1 to 6.0.1][1]
- **Microsoft.NET.Runtime.MonoAOTCompiler.Task**: [from 6.0.1 to 6.0.1][1]
- **Microsoft.Internal.Runtime.AspNetCore.Transport**: [from 6.0.1-servicing.21565.18 to 6.0.1-servicing.21567.5][1]
- **Microsoft.Extensions.HostFactoryResolver.Sources**: [from 6.0.0-rtm.21522.10 to 6.0.1-servicing.21567.5][2]
- **Microsoft.NET.Runtime.WebAssembly.Sdk**: [from 6.0.1 to 6.0.1][1]
- **Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm**: [from 6.0.1 to 6.0.1][1]
[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC7280473&targetVersion=GC3a25a7f&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC4822e3c&targetVersion=GC3a25a7f&_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**: 20211117.12
- **Date Produced**: November 18, 2021 12:09:23 AM UTC
- **Commit**: 41e6aaaf6216de904530de11b0bfd4af43fb13f7
- **Branch**: refs/heads/internal/release/6.0
[DependencyUpdate]: <> (Begin)
- **Updates**:
- **Microsoft.EntityFrameworkCore.Tools**: [from 6.0.1 to 6.0.1][1]
- **dotnet-ef**: [from 6.0.1 to 6.0.1][1]
- **Microsoft.EntityFrameworkCore**: [from 6.0.1 to 6.0.1][1]
- **Microsoft.EntityFrameworkCore.SqlServer**: [from 6.0.1 to 6.0.1][1]
- **Microsoft.EntityFrameworkCore.InMemory**: [from 6.0.1 to 6.0.1][1]
- **Microsoft.EntityFrameworkCore.Relational**: [from 6.0.1 to 6.0.1][1]
- **Microsoft.EntityFrameworkCore.Sqlite**: [from 6.0.1 to 6.0.1][1]
- **Microsoft.EntityFrameworkCore.Design**: [from 6.0.1 to 6.0.1][1]
[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-efcore/branches?baseVersion=GC6fc3e17&targetVersion=GC41e6aaa&_a=files
[DependencyUpdate]: <> (End)
[marker]: <> (End:1ac68a20-28fc-4e11-3a4d-08d961c5a689)
-rw-r--r-- | NuGet.config | 9 | ||||
-rw-r--r-- | eng/Version.Details.xml | 66 | ||||
-rw-r--r-- | eng/Versions.props | 8 |
3 files changed, 43 insertions, 40 deletions
diff --git a/NuGet.config b/NuGet.config index 235a74c41f..aa6163b399 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,10 +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-7280473" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-72804738/nuget/v3/index.json" /> + <add key="darc-int-dotnet-runtime-3a25a7f" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-3a25a7f1/nuget/v3/index.json" /> <!-- End: Package sources from dotnet-runtime --> <!-- Begin: Package sources from dotnet-efcore --> - <add key="darc-pub-dotnet-efcore-6fc3e170" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-efcore-6fc3e170/nuget/v3/index.json" /> + <add key="darc-int-dotnet-efcore-41e6aaa" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-41e6aaaf/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" /> @@ -26,8 +26,11 @@ <disabledPackageSources> <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-41e6aaa" value="true" /> + <!-- End: Package sources from dotnet-efcore --> <!-- Begin: Package sources from dotnet-runtime --> - <add key="darc-int-dotnet-runtime-7280473" value="true" /> + <add key="darc-int-dotnet-runtime-3a25a7f" 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 4e69024b6c..6b6b837c3d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -10,36 +10,36 @@ <Dependencies> <ProductDependencies> <Dependency Name="dotnet-ef" Version="6.0.1"> - <Uri>https://github.com/dotnet/efcore</Uri> - <Sha>6fc3e1705061ffa3b46ee05167d26e2048b97ddf</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri> + <Sha>41e6aaaf6216de904530de11b0bfd4af43fb13f7</Sha> </Dependency> <Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.1"> - <Uri>https://github.com/dotnet/efcore</Uri> - <Sha>6fc3e1705061ffa3b46ee05167d26e2048b97ddf</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri> + <Sha>41e6aaaf6216de904530de11b0bfd4af43fb13f7</Sha> </Dependency> <Dependency Name="Microsoft.EntityFrameworkCore.Relational" Version="6.0.1"> - <Uri>https://github.com/dotnet/efcore</Uri> - <Sha>6fc3e1705061ffa3b46ee05167d26e2048b97ddf</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri> + <Sha>41e6aaaf6216de904530de11b0bfd4af43fb13f7</Sha> </Dependency> <Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.1"> - <Uri>https://github.com/dotnet/efcore</Uri> - <Sha>6fc3e1705061ffa3b46ee05167d26e2048b97ddf</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri> + <Sha>41e6aaaf6216de904530de11b0bfd4af43fb13f7</Sha> </Dependency> <Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.1"> - <Uri>https://github.com/dotnet/efcore</Uri> - <Sha>6fc3e1705061ffa3b46ee05167d26e2048b97ddf</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri> + <Sha>41e6aaaf6216de904530de11b0bfd4af43fb13f7</Sha> </Dependency> <Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="6.0.1"> - <Uri>https://github.com/dotnet/efcore</Uri> - <Sha>6fc3e1705061ffa3b46ee05167d26e2048b97ddf</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri> + <Sha>41e6aaaf6216de904530de11b0bfd4af43fb13f7</Sha> </Dependency> <Dependency Name="Microsoft.EntityFrameworkCore" Version="6.0.1"> - <Uri>https://github.com/dotnet/efcore</Uri> - <Sha>6fc3e1705061ffa3b46ee05167d26e2048b97ddf</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri> + <Sha>41e6aaaf6216de904530de11b0bfd4af43fb13f7</Sha> </Dependency> <Dependency Name="Microsoft.EntityFrameworkCore.Design" Version="6.0.1"> - <Uri>https://github.com/dotnet/efcore</Uri> - <Sha>6fc3e1705061ffa3b46ee05167d26e2048b97ddf</Sha> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri> + <Sha>41e6aaaf6216de904530de11b0bfd4af43fb13f7</Sha> </Dependency> <Dependency Name="Microsoft.Extensions.Caching.Abstractions" Version="6.0.0"> <Uri>https://github.com/dotnet/runtime</Uri> @@ -113,9 +113,9 @@ <Uri>https://github.com/dotnet/runtime</Uri> <Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha> </Dependency> - <Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="6.0.0-rtm.21522.10"> - <Uri>https://github.com/dotnet/runtime</Uri> - <Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha> + <Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="6.0.1-servicing.21567.5"> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> + <Sha>3a25a7f1cc446b60678ed25c9d829420d6321eba</Sha> </Dependency> <Dependency Name="Microsoft.Extensions.Hosting.Abstractions" 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.1-servicing.21565.18"> + <Dependency Name="Microsoft.Internal.Runtime.AspNetCore.Transport" Version="6.0.1-servicing.21567.5"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>7280473880b4010b724bfcca78877dbafd202e2d</Sha> + <Sha>3a25a7f1cc446b60678ed25c9d829420d6321eba</Sha> </Dependency> <Dependency Name="System.Diagnostics.DiagnosticSource" Version="6.0.0"> <Uri>https://github.com/dotnet/runtime</Uri> @@ -195,7 +195,7 @@ </Dependency> <Dependency Name="System.IO.Pipelines" Version="6.0.1"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>7280473880b4010b724bfcca78877dbafd202e2d</Sha> + <Sha>3a25a7f1cc446b60678ed25c9d829420d6321eba</Sha> </Dependency> <Dependency Name="System.Net.Http.Json" Version="6.0.0"> <Uri>https://github.com/dotnet/runtime</Uri> @@ -233,9 +233,9 @@ <Uri>https://github.com/dotnet/runtime</Uri> <Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha> </Dependency> - <Dependency Name="System.Text.Json" Version="6.0.0"> - <Uri>https://github.com/dotnet/runtime</Uri> - <Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha> + <Dependency Name="System.Text.Json" Version="6.0.1"> + <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> + <Sha>3a25a7f1cc446b60678ed25c9d829420d6321eba</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.1"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>7280473880b4010b724bfcca78877dbafd202e2d</Sha> + <Sha>3a25a7f1cc446b60678ed25c9d829420d6321eba</Sha> </Dependency> <Dependency Name="Microsoft.NET.Runtime.MonoAOTCompiler.Task" Version="6.0.1"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>7280473880b4010b724bfcca78877dbafd202e2d</Sha> + <Sha>3a25a7f1cc446b60678ed25c9d829420d6321eba</Sha> </Dependency> <Dependency Name="Microsoft.NET.Runtime.WebAssembly.Sdk" Version="6.0.1"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>7280473880b4010b724bfcca78877dbafd202e2d</Sha> + <Sha>3a25a7f1cc446b60678ed25c9d829420d6321eba</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.1"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>7280473880b4010b724bfcca78877dbafd202e2d</Sha> + <Sha>3a25a7f1cc446b60678ed25c9d829420d6321eba</Sha> </Dependency> <Dependency Name="Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm" Version="6.0.1"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>7280473880b4010b724bfcca78877dbafd202e2d</Sha> + <Sha>3a25a7f1cc446b60678ed25c9d829420d6321eba</Sha> </Dependency> - <Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="6.0.1-servicing.21565.18"> + <Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="6.0.1-servicing.21567.5"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>7280473880b4010b724bfcca78877dbafd202e2d</Sha> + <Sha>3a25a7f1cc446b60678ed25c9d829420d6321eba</Sha> </Dependency> </ProductDependencies> <ToolsetDependencies> <!-- Listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 --> <Dependency Name="Microsoft.NETCore.Platforms" Version="6.0.1"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> - <Sha>7280473880b4010b724bfcca78877dbafd202e2d</Sha> + <Sha>3a25a7f1cc446b60678ed25c9d829420d6321eba</Sha> </Dependency> <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21560.2"> <Uri>https://github.com/dotnet/arcade</Uri> diff --git a/eng/Versions.props b/eng/Versions.props index b88a326bec..8b1e3ae657 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,7 +70,7 @@ <MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>6.0.1</MicrosoftNETRuntimeMonoAOTCompilerTaskVersion> <MicrosoftNETRuntimeWebAssemblySdkVersion>6.0.1</MicrosoftNETRuntimeWebAssemblySdkVersion> <MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>6.0.1</MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion> - <MicrosoftNETCoreBrowserDebugHostTransportVersion>6.0.1-servicing.21565.18</MicrosoftNETCoreBrowserDebugHostTransportVersion> + <MicrosoftNETCoreBrowserDebugHostTransportVersion>6.0.1-servicing.21567.5</MicrosoftNETCoreBrowserDebugHostTransportVersion> <MicrosoftExtensionsCachingAbstractionsVersion>6.0.0</MicrosoftExtensionsCachingAbstractionsVersion> <MicrosoftExtensionsCachingMemoryVersion>6.0.0</MicrosoftExtensionsCachingMemoryVersion> <MicrosoftExtensionsConfigurationAbstractionsVersion>6.0.0</MicrosoftExtensionsConfigurationAbstractionsVersion> @@ -89,7 +89,7 @@ <MicrosoftExtensionsFileProvidersCompositeVersion>6.0.0</MicrosoftExtensionsFileProvidersCompositeVersion> <MicrosoftExtensionsFileProvidersPhysicalVersion>6.0.0</MicrosoftExtensionsFileProvidersPhysicalVersion> <MicrosoftExtensionsFileSystemGlobbingVersion>6.0.0</MicrosoftExtensionsFileSystemGlobbingVersion> - <MicrosoftExtensionsHostFactoryResolverSourcesVersion>6.0.0-rtm.21522.10</MicrosoftExtensionsHostFactoryResolverSourcesVersion> + <MicrosoftExtensionsHostFactoryResolverSourcesVersion>6.0.1-servicing.21567.5</MicrosoftExtensionsHostFactoryResolverSourcesVersion> <MicrosoftExtensionsHostingAbstractionsVersion>6.0.0</MicrosoftExtensionsHostingAbstractionsVersion> <MicrosoftExtensionsHostingVersion>6.0.0</MicrosoftExtensionsHostingVersion> <MicrosoftExtensionsHttpVersion>6.0.0</MicrosoftExtensionsHttpVersion> @@ -105,7 +105,7 @@ <MicrosoftExtensionsOptionsDataAnnotationsVersion>6.0.0</MicrosoftExtensionsOptionsDataAnnotationsVersion> <MicrosoftExtensionsOptionsVersion>6.0.0</MicrosoftExtensionsOptionsVersion> <MicrosoftExtensionsPrimitivesVersion>6.0.0</MicrosoftExtensionsPrimitivesVersion> - <MicrosoftInternalRuntimeAspNetCoreTransportVersion>6.0.1-servicing.21565.18</MicrosoftInternalRuntimeAspNetCoreTransportVersion> + <MicrosoftInternalRuntimeAspNetCoreTransportVersion>6.0.1-servicing.21567.5</MicrosoftInternalRuntimeAspNetCoreTransportVersion> <SystemDiagnosticsDiagnosticSourceVersion>6.0.0</SystemDiagnosticsDiagnosticSourceVersion> <SystemDiagnosticsEventLogVersion>6.0.0</SystemDiagnosticsEventLogVersion> <SystemDirectoryServicesProtocolsVersion>6.0.0</SystemDirectoryServicesProtocolsVersion> @@ -119,7 +119,7 @@ <SystemSecurityCryptographyXmlVersion>6.0.0</SystemSecurityCryptographyXmlVersion> <SystemServiceProcessServiceControllerVersion>6.0.0</SystemServiceProcessServiceControllerVersion> <SystemTextEncodingsWebVersion>6.0.0</SystemTextEncodingsWebVersion> - <SystemTextJsonVersion>6.0.0</SystemTextJsonVersion> + <SystemTextJsonVersion>6.0.1</SystemTextJsonVersion> <SystemThreadingChannelsVersion>6.0.0</SystemThreadingChannelsVersion> <!-- Only listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 --> <MicrosoftNETCorePlatformsVersion>6.0.1</MicrosoftNETCorePlatformsVersion> |