Skip to content

Commit

Permalink
Merged PR 16696: [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.18 to 3.1.18 (parent: Microsoft.Extensions.Logging)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 3.1.18 to 3.1.18 (parent: Microsoft.Extensions.Logging)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 3.1.18 to 3.1.18 (parent: Microsoft.Extensions.Logging)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 3.1.18 to 3.1.18 (parent: Microsoft.Extensions.Logging)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 3.1.18 to 3.1.18 (parent: Microsoft.Extensions.Logging)
  - **Microsoft.NETCore.App.Internal**: from 3.1.18-servicing.21363.6 to 3.1.18-servicing.21364.2 (parent: Microsoft.Extensions.Logging)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 3.1.18 to 3.1.18 (parent: Microsoft.Extensions.Logging)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:69367bda-f465-40d4-e1e9-08d79559e508)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-extensions
- **Subscription**: 69367bda-f465-40d4-e1e9-08d79559e508
- **Build**: 20210714.3
- **Date Produced**: 7/14/2021 7:01 PM
- **Commit**: 9130c4bf47c4920f1f3dffb7504119c367b83808
- **Branch**: refs/heads/internal/release/3.1

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.AspNetCore.BenchmarkRunner.Sources**: [from 3.1.18-servicing.21363.9 to 3.1.18-servicing.21364.3][1]
  - **Microsoft.AspNetCore.Testing**: [from 3.1.18-servicing.21363.9 to 3.1.18-servicing.21364.3][1]
  - **Microsoft.Extensions.CommandLineUtils.Sources**: [from 3.1.18-servicing.21363.9 to 3.1.18-servicing.21364.3][1]
  - **Microsoft.Extensions.NonCapturingTimer.Sources**: [from 3.1.18-servicing.21363.9 to 3.1.18-servicing.21364.3][1]
  - **Microsoft.Extensions.HashCodeCombiner.Sources**: [from 3.1.18-servicing.21363.9 to 3.1.18-servicing.21364.3][1]
  - **Microsoft.Extensions.Logging**: [from 3.1.18 to 3.1.18][1]
  - **Microsoft.NETCore.App.Runtime.win-x64**: [from 3.1.18 to 3.1.18][2]
  - **Microsoft.NETCore.App.Runtime.win-x64**: [from 3.1.18 to 3.1.18][2]
  - **Microsoft.NETCore.App.Runtime.win-x64**: [from 3.1.18 to 3.1.18][2]
  - **Microsoft.NETCore.App.Runtime.win-x64**: [from 3.1.18 to 3.1.18][2]
  - **Microsoft.NETCore.App.Runtime.win-x64**: [from 3.1.18 to 3.1.18][2]
  - **Microsoft.NETCore.App.Internal**: [from 3.1.18-servicing.21363.6 to 3.1.18-servicing.21364.2][2]
  - **Microsoft.NETCore.App.Runtime.win-x64**: [from 3.1.18 to 3.1.18][2]

[1]: https://dev.az...
  • Loading branch information
dotnet-bot authored and vseanreesermsft committed Jul 14, 2021
1 parent 0447cf4 commit 48aeeba
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 23 deletions.
7 changes: 4 additions & 3 deletions NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
<!-- 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-8a50231" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-core-setup-8a502311/nuget/v3/index.json" />
<add key="darc-int-dotnet-core-setup-5d3919d" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-core-setup-5d3919d3/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-core-setup -->
<!-- Begin: Package sources from dotnet-extensions -->
<add key="darc-int-dotnet-extensions-783dea4" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-extensions-783dea4c/nuget/v3/index.json" />
<add key="darc-int-dotnet-extensions-9130c4b" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-extensions-9130c4bf/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 +25,13 @@
<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-783dea4" value="true" />
<add key="darc-int-dotnet-extensions-9130c4b" 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-5d3919d" value="true" />
<add key="darc-int-dotnet-core-setup-8a50231" value="true" />
<add key="darc-int-dotnet-core-setup-7bbff11" value="true" />
<add key="darc-int-dotnet-core-setup-7bbff11" value="true" />
Expand Down
28 changes: 14 additions & 14 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.18-servicing.21363.9">
<Dependency Name="Microsoft.Extensions.CommandLineUtils.Sources" Version="3.1.18-servicing.21364.3">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
<Sha>783dea4cf1c159d05137062e98d75f28d548df9a</Sha>
<Sha>9130c4bf47c4920f1f3dffb7504119c367b83808</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.HashCodeCombiner.Sources" Version="3.1.18-servicing.21363.9">
<Dependency Name="Microsoft.Extensions.HashCodeCombiner.Sources" Version="3.1.18-servicing.21364.3">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
<Sha>783dea4cf1c159d05137062e98d75f28d548df9a</Sha>
<Sha>9130c4bf47c4920f1f3dffb7504119c367b83808</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.NonCapturingTimer.Sources" Version="3.1.18-servicing.21363.9">
<Dependency Name="Microsoft.Extensions.NonCapturingTimer.Sources" Version="3.1.18-servicing.21364.3">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
<Sha>783dea4cf1c159d05137062e98d75f28d548df9a</Sha>
<Sha>9130c4bf47c4920f1f3dffb7504119c367b83808</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Logging" Version="3.1.18">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
<Sha>783dea4cf1c159d05137062e98d75f28d548df9a</Sha>
<Sha>9130c4bf47c4920f1f3dffb7504119c367b83808</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.BenchmarkRunner.Sources" Version="3.1.18-servicing.21363.9">
<Dependency Name="Microsoft.AspNetCore.BenchmarkRunner.Sources" Version="3.1.18-servicing.21364.3">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
<Sha>783dea4cf1c159d05137062e98d75f28d548df9a</Sha>
<Sha>9130c4bf47c4920f1f3dffb7504119c367b83808</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.Testing" Version="3.1.18-servicing.21363.9">
<Dependency Name="Microsoft.AspNetCore.Testing" Version="3.1.18-servicing.21364.3">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
<Sha>783dea4cf1c159d05137062e98d75f28d548df9a</Sha>
<Sha>9130c4bf47c4920f1f3dffb7504119c367b83808</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>3acd9b0cd16596bad450c82be08780875a73c05c</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Internal" Version="3.1.18-servicing.21363.6" CoherentParentDependency="Microsoft.Extensions.Logging">
<Dependency Name="Microsoft.NETCore.App.Internal" Version="3.1.18-servicing.21364.2" CoherentParentDependency="Microsoft.Extensions.Logging">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup</Uri>
<Sha>8a5023112d98ab3a1410126633749ad0e0a172c0</Sha>
<Sha>5d3919d34e0d8940ee50c36d823ddc28d6b1723c</Sha>
</Dependency>
<!-- Listed as a dependency to workaround https://github.com/dotnet/cli/issues/10528 -->
<Dependency Name="Microsoft.NETCore.Platforms" Version="3.1.7" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
Expand All @@ -64,7 +64,7 @@
-->
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="3.1.18" CoherentParentDependency="Microsoft.Extensions.Logging">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup</Uri>
<Sha>8a5023112d98ab3a1410126633749ad0e0a172c0</Sha>
<Sha>5d3919d34e0d8940ee50c36d823ddc28d6b1723c</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
12 changes: 6 additions & 6 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.18-servicing.21363.9</MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>
<MicrosoftAspNetCoreTestingPackageVersion>3.1.18-servicing.21363.9</MicrosoftAspNetCoreTestingPackageVersion>
<MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>3.1.18-servicing.21363.9</MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>
<MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>3.1.18-servicing.21364.3</MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>
<MicrosoftAspNetCoreTestingPackageVersion>3.1.18-servicing.21364.3</MicrosoftAspNetCoreTestingPackageVersion>
<MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>3.1.18-servicing.21364.3</MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>
<MicrosoftExtensionsDependencyModelPackageVersion>3.1.6</MicrosoftExtensionsDependencyModelPackageVersion>
<MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>3.1.18-servicing.21363.9</MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>
<MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>3.1.18-servicing.21364.3</MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>
<MicrosoftExtensionsLoggingPackageVersion>3.1.18</MicrosoftExtensionsLoggingPackageVersion>
<MicrosoftExtensionsNonCapturingTimerSourcesPackageVersion>3.1.18-servicing.21363.9</MicrosoftExtensionsNonCapturingTimerSourcesPackageVersion>
<MicrosoftExtensionsNonCapturingTimerSourcesPackageVersion>3.1.18-servicing.21364.3</MicrosoftExtensionsNonCapturingTimerSourcesPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>3.1.0</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>3.1.18</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreAppInternalPackageVersion>3.1.18-servicing.21363.6</MicrosoftNETCoreAppInternalPackageVersion>
<MicrosoftNETCoreAppInternalPackageVersion>3.1.18-servicing.21364.2</MicrosoftNETCoreAppInternalPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>3.1.7</MicrosoftNETCorePlatformsPackageVersion>
<SystemTextJsonPackageVersion>4.7.2</SystemTextJsonPackageVersion>
<SystemDiagnosticsDiagnosticSourcePackageVersion>4.7.1</SystemDiagnosticsDiagnosticSourcePackageVersion>
Expand Down

0 comments on commit 48aeeba

Please sign in to comment.