Skip to content

Commit

Permalink
Merged PR 26462: [internal/release/3.1] Update dependencies from dnce…
Browse files Browse the repository at this point in the history
…ng/internal/dotnet-extensions

This pull request updates the following dependencies

[marker]: <> (Begin:Coherency Updates)
## Coherency Updates

The following updates ensure that dependencies with a *CoherentParentDependency*
attribute were produced in a build used as input to the parent dependency's build.
See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview)

[DependencyUpdate]: <> (Begin)

- **Coherency Updates**:
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 3.1.30 to 3.1.31 (parent: Microsoft.Extensions.Logging)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 3.1.30 to 3.1.31 (parent: Microsoft.Extensions.Logging)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 3.1.30 to 3.1.31 (parent: Microsoft.Extensions.Logging)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 3.1.30 to 3.1.31 (parent: Microsoft.Extensions.Logging)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 3.1.30 to 3.1.31 (parent: Microsoft.Extensions.Logging)
  - **Microsoft.NETCore.App.Internal**: from 3.1.30-servicing.22476.9 to 3.1.31-servicing.22513.7 (parent: Microsoft.Extensions.Logging)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 3.1.30 to 3.1.31 (parent: Microsoft.Extensions.Logging)

[DependencyUpdate]: <> (End)

[marker]: <> (End:Coherency Updates)

[marker]: <> (Begin:9535ce9e-e77c-458c-58f2-08d98e7730ac)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-extensions
- **Subscription**: 9535ce9e-e77c-458c-58f2-08d98e7730ac
- **Build**: 20221014.1
- **Date Produced**: October 14, 2022 7:53:32 AM UTC
- **Commit**: cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b
- **Branch**: refs/heads/internal/release/3.1

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.AspNetCore.BenchmarkRunner.Sources**: [from 3.1.30-servicing.22476.2 to 3.1.31-servicing.22514.1][5]
  - **Microsoft.AspNetCore.Testing**: [from 3.1.30-servicing.22476.2 to 3.1.31-servicing.22514.1][5]
  - **Microsoft.Extensions.CommandLineUtils.Sources**: [from 3.1.30-servicing.22476.2 to 3.1.31-servicing.22514.1][5]
  - **Microsoft.Extensions.HashCodeCombiner.Sources**: [from 3.1.30-servicing.22476.2 to 3.1.31-servicing.22514.1][5]
  - **Microsoft.Extensions.Logging**: [from 3.1.30 to 3.1.31][5]
  - **Microsoft.Extensions.NonCapturingTimer.Sources**: [from 3.1.30-servicing.22476.2 to 3.1.31-servicing.22514.1][5]
  - **Microsoft.NETCore.App.Runtime.win-x64**: [from 3.1.30 to 3.1.31][6]
  - **Microsoft.NETCore.App.Runtime.win-x64**: [from 3.1.30 to 3.1.31][6]
  - **Microsoft.NETCore.App.Runtime.win-x64**: [from 3.1.30 to 3.1.31][6]
  - **Microsoft.NETCore.App.Runtime.win-x64**: [from 3.1.30 to 3.1.31][6]
  - **Microsoft.NETCore.App.Runtime.win-x64**: [from 3.1.30 to 3.1.31][6]
  - **Microsoft.NETCore.App.Internal**: [from 3.1.30-servicing.22476.9 to 3.1.31-servicing.22513.7][6]
  - **Microsoft.NETCore.App.Runtime.win-x64**: [from 3.1.30 to 3.1.31][6]

[...
  • Loading branch information
dotnet-bot authored and vseanreesermsft committed Oct 14, 2022
2 parents e6ce839 + 8068d74 commit 50c266c
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 27 deletions.
9 changes: 6 additions & 3 deletions NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,11 @@
<!-- Begin: Package sources from dotnet-corefx -->
<!-- End: Package sources from dotnet-corefx -->
<!-- Begin: Package sources from dotnet-core-setup -->
<add key="darc-int-dotnet-core-setup-6ea7191" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-core-setup-6ea71919/nuget/v3/index.json" />
<add key="darc-int-dotnet-core-setup-0e404aa" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-core-setup-0e404aa9/nuget/v3/index.json" />
<add key="darc-int-dotnet-core-setup-0e404aa-1" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-core-setup-0e404aa9-1/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-core-setup -->
<!-- Begin: Package sources from dotnet-extensions -->
<add key="darc-int-dotnet-extensions-c62ee3d" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-extensions-c62ee3d0/nuget/v3/index.json" />
<add key="darc-int-dotnet-extensions-cc9959c" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-extensions-cc9959c7/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-extensions -->
<!--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" />
Expand All @@ -25,12 +26,14 @@
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-extensions -->
<add key="darc-int-dotnet-extensions-c62ee3d" value="true" />
<add key="darc-int-dotnet-extensions-cc9959c" value="true" />
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
<add key="darc-int-dotnet-extensions-4210e7d" value="true" />
<add key="darc-int-dotnet-extensions-4210e7d" value="true" />
<!-- End: Package sources from dotnet-extensions -->
<!-- Begin: Package sources from dotnet-core-setup -->
<add key="darc-int-dotnet-core-setup-0e404aa-1" value="true" />
<add key="darc-int-dotnet-core-setup-0e404aa" value="true" />
<add key="darc-int-dotnet-core-setup-6ea7191" value="true" />
<add key="darc-int-dotnet-core-setup-e96b8e2" value="true" />
<add key="darc-int-dotnet-core-setup-3f2ca30" value="true" />
Expand Down
32 changes: 16 additions & 16 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.Extensions.CommandLineUtils.Sources" Version="3.1.30-servicing.22476.2">
<Dependency Name="Microsoft.Extensions.CommandLineUtils.Sources" Version="3.1.31-servicing.22514.1">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
<Sha>c62ee3d0c9492db518f79bf5e4d364bce7c78c66</Sha>
<Sha>cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.HashCodeCombiner.Sources" Version="3.1.30-servicing.22476.2">
<Dependency Name="Microsoft.Extensions.HashCodeCombiner.Sources" Version="3.1.31-servicing.22514.1">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
<Sha>c62ee3d0c9492db518f79bf5e4d364bce7c78c66</Sha>
<Sha>cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.NonCapturingTimer.Sources" Version="3.1.30-servicing.22476.2">
<Dependency Name="Microsoft.Extensions.NonCapturingTimer.Sources" Version="3.1.31-servicing.22514.1">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
<Sha>c62ee3d0c9492db518f79bf5e4d364bce7c78c66</Sha>
<Sha>cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Logging" Version="3.1.30">
<Dependency Name="Microsoft.Extensions.Logging" Version="3.1.31">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
<Sha>c62ee3d0c9492db518f79bf5e4d364bce7c78c66</Sha>
<Sha>cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.BenchmarkRunner.Sources" Version="3.1.30-servicing.22476.2">
<Dependency Name="Microsoft.AspNetCore.BenchmarkRunner.Sources" Version="3.1.31-servicing.22514.1">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
<Sha>c62ee3d0c9492db518f79bf5e4d364bce7c78c66</Sha>
<Sha>cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.Testing" Version="3.1.30-servicing.22476.2">
<Dependency Name="Microsoft.AspNetCore.Testing" Version="3.1.31-servicing.22514.1">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
<Sha>c62ee3d0c9492db518f79bf5e4d364bce7c78c66</Sha>
<Sha>cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b</Sha>
</Dependency>
<Dependency Name="System.Text.Json" Version="4.7.2" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-corefx</Uri>
Expand All @@ -49,9 +49,9 @@
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup</Uri>
<Sha>9165b88e05fc37585aa1c3fc9585b5a7d751bb21</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Internal" Version="3.1.30-servicing.22476.9" CoherentParentDependency="Microsoft.Extensions.Logging">
<Dependency Name="Microsoft.NETCore.App.Internal" Version="3.1.31-servicing.22513.7" CoherentParentDependency="Microsoft.Extensions.Logging">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup</Uri>
<Sha>6ea71919a5bbed566449efe09e953e78abcc5363</Sha>
<Sha>0e404aa9b868b6ad67321cb3a0a6161c25b966d4</Sha>
</Dependency>
<!-- Listed as a dependency to workaround https://github.com/dotnet/cli/issues/10528 -->
<Dependency Name="Microsoft.NETCore.Platforms" Version="3.1.9" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
Expand All @@ -62,9 +62,9 @@
Win-x64 is used here because we have picked an arbitrary runtime identifier to flow the version of the latest NETCore.App runtime.
All Runtime.$rid packages should have the same version.
-->
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="3.1.30" CoherentParentDependency="Microsoft.Extensions.Logging">
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="3.1.31" CoherentParentDependency="Microsoft.Extensions.Logging">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup</Uri>
<Sha>6ea71919a5bbed566449efe09e953e78abcc5363</Sha>
<Sha>0e404aa9b868b6ad67321cb3a0a6161c25b966d4</Sha>
</Dependency>
<!-- Keep this dependency at the bottom of ProductDependencies, else it will be picked as the parent for CoherentParentDependencies -->
<Dependency Name="Microsoft.NETCore.App.Ref" Version="3.1.0" Pinned="true">
Expand Down
16 changes: 8 additions & 8 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -47,16 +47,16 @@
-->
<PropertyGroup Label="Automated">
<MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>3.1.30-servicing.22476.2</MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>
<MicrosoftAspNetCoreTestingPackageVersion>3.1.30-servicing.22476.2</MicrosoftAspNetCoreTestingPackageVersion>
<MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>3.1.30-servicing.22476.2</MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>
<MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>3.1.31-servicing.22514.1</MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>
<MicrosoftAspNetCoreTestingPackageVersion>3.1.31-servicing.22514.1</MicrosoftAspNetCoreTestingPackageVersion>
<MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>3.1.31-servicing.22514.1</MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>
<MicrosoftExtensionsDependencyModelPackageVersion>3.1.25</MicrosoftExtensionsDependencyModelPackageVersion>
<MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>3.1.30-servicing.22476.2</MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>
<MicrosoftExtensionsLoggingPackageVersion>3.1.30</MicrosoftExtensionsLoggingPackageVersion>
<MicrosoftExtensionsNonCapturingTimerSourcesPackageVersion>3.1.30-servicing.22476.2</MicrosoftExtensionsNonCapturingTimerSourcesPackageVersion>
<MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>3.1.31-servicing.22514.1</MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>
<MicrosoftExtensionsLoggingPackageVersion>3.1.31</MicrosoftExtensionsLoggingPackageVersion>
<MicrosoftExtensionsNonCapturingTimerSourcesPackageVersion>3.1.31-servicing.22514.1</MicrosoftExtensionsNonCapturingTimerSourcesPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>3.1.0</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>3.1.30</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreAppInternalPackageVersion>3.1.30-servicing.22476.9</MicrosoftNETCoreAppInternalPackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>3.1.31</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreAppInternalPackageVersion>3.1.31-servicing.22513.7</MicrosoftNETCoreAppInternalPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>3.1.9</MicrosoftNETCorePlatformsPackageVersion>
<SystemTextJsonPackageVersion>4.7.2</SystemTextJsonPackageVersion>
<SystemDiagnosticsDiagnosticSourcePackageVersion>4.7.1</SystemDiagnosticsDiagnosticSourcePackageVersion>
Expand Down

0 comments on commit 50c266c

Please sign in to comment.