Skip to content

Commit

Permalink
Merged PR 8352: [internal/release/3.1] Update dependencies from dncen…
Browse files Browse the repository at this point in the history 
…g/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)

- **Microsoft.NETCore.App.Runtime.win-x64**: from 3.1.5 to 3.1.6 (parent: Microsoft.Extensions.Logging)
- **Microsoft.Extensions.DependencyModel**: from 3.1.5 to 3.1.6 (parent: Microsoft.Extensions.Logging)
- **Microsoft.NETCore.App.Internal**: from 3.1.5-servicing.20270.5 to 3.1.6-servicing.20316.4 (parent: Microsoft.Extensions.Logging)

[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**: 20200616.5
- **Date Produced**: 6/17/2020 7:08 AM
- **Commit**: be18161fbed286d6fb7a7b1c7999ce70a50cf3eb
- **Branch**: refs/heads/internal/release/3.1
- **Updates**:
  - **Microsoft.Extensions.CommandLineUtils.Sources**: from 3.1.5-servicing.20270.9 to 3.1.6-servicing.20316.5
  - **Microsoft.AspNetCore.Testing**: from 3.1.5-servicing.20270.9 to 3.1.6-servicing.20316.5
  - **Microsoft.AspNetCore.BenchmarkRunner.Sources**: from 3.1.5-servicing.20270.9 to 3.1.6-servicing.20316.5
  - **Microsoft.Extensions.NonCapturingTimer.Sources**: from 3.1.5-servicing.20270.9 to 3.1.6-servicing.20316.5
  - **Microsoft.Extensions.HashCodeCombiner.Sources**: from 3.1.5-servicing.20270.9 to 3.1.6-servicing.20316.5
  - **Microsoft.Extensions.Logging**: from 3.1.5 to 3.1.6
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 3.1.5 to 3.1.6
  - **Microsoft.Extensions.DependencyModel**: from 3.1.5 to 3.1.6
  - **Microsoft.NETCore.App.Internal**: from 3.1.5-servicing.20270.5 to 3.1.6-servicing.20316.4

[marker]: <> (End:69367bda-f465-40d4-e1e9-08d79559e508)
  • Loading branch information
@dotnet-bot @wtgodbe
dotnet-bot authored and wtgodbe committed Jun 17, 2020
1 parent cef995f commit d63ec4a
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 27 deletions.
3 changes: 3 additions & 0 deletions NuGet.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<add key="darc-pub-dotnet-corefx-8a3ffed" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-corefx-8a3ffed5/nuget/v3/index.json" />
<add key="darc-int-dotnet-extensions-be18161" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-extensions-be18161f/nuget/v3/index.json" />
<add key="darc-int-dotnet-core-setup-3acd9b0" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-core-setup-3acd9b0c/nuget/v3/index.json" />
<add key="darc-int-dotnet-corefx-059a4a1" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-corefx-059a4a19/nuget/v3/index.json" />
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
<add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
Expand Down
36 changes: 18 additions & 18 deletions eng/Version.Details.xml
View file
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.5-servicing.20270.9">
<Dependency Name="Microsoft.Extensions.CommandLineUtils.Sources" Version="3.1.6-servicing.20316.5">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
<Sha>877455ff72cbb5834c52c12ce962f1417f5477c8</Sha>
<Sha>be18161fbed286d6fb7a7b1c7999ce70a50cf3eb</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.HashCodeCombiner.Sources" Version="3.1.5-servicing.20270.9">
<Dependency Name="Microsoft.Extensions.HashCodeCombiner.Sources" Version="3.1.6-servicing.20316.5">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
<Sha>877455ff72cbb5834c52c12ce962f1417f5477c8</Sha>
<Sha>be18161fbed286d6fb7a7b1c7999ce70a50cf3eb</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.NonCapturingTimer.Sources" Version="3.1.5-servicing.20270.9">
<Dependency Name="Microsoft.Extensions.NonCapturingTimer.Sources" Version="3.1.6-servicing.20316.5">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
<Sha>877455ff72cbb5834c52c12ce962f1417f5477c8</Sha>
<Sha>be18161fbed286d6fb7a7b1c7999ce70a50cf3eb</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Logging" Version="3.1.5">
<Dependency Name="Microsoft.Extensions.Logging" Version="3.1.6">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
<Sha>877455ff72cbb5834c52c12ce962f1417f5477c8</Sha>
<Sha>be18161fbed286d6fb7a7b1c7999ce70a50cf3eb</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.BenchmarkRunner.Sources" Version="3.1.5-servicing.20270.9">
<Dependency Name="Microsoft.AspNetCore.BenchmarkRunner.Sources" Version="3.1.6-servicing.20316.5">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
<Sha>877455ff72cbb5834c52c12ce962f1417f5477c8</Sha>
<Sha>be18161fbed286d6fb7a7b1c7999ce70a50cf3eb</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.Testing" Version="3.1.5-servicing.20270.9">
<Dependency Name="Microsoft.AspNetCore.Testing" Version="3.1.6-servicing.20316.5">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
<Sha>877455ff72cbb5834c52c12ce962f1417f5477c8</Sha>
<Sha>be18161fbed286d6fb7a7b1c7999ce70a50cf3eb</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 @@ -45,13 +45,13 @@
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>8a3ffed558ddf943c1efa87d693227722d6af094</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="3.1.5" CoherentParentDependency="Microsoft.Extensions.Logging">
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="3.1.6" CoherentParentDependency="Microsoft.Extensions.Logging">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup</Uri>
<Sha>65cd7897774a464b5991c1962f7a0d476bb63101</Sha>
<Sha>3acd9b0cd16596bad450c82be08780875a73c05c</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Internal" Version="3.1.5-servicing.20270.5" CoherentParentDependency="Microsoft.Extensions.Logging">
<Dependency Name="Microsoft.NETCore.App.Internal" Version="3.1.6-servicing.20316.4" CoherentParentDependency="Microsoft.Extensions.Logging">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup</Uri>
<Sha>65cd7897774a464b5991c1962f7a0d476bb63101</Sha>
<Sha>3acd9b0cd16596bad450c82be08780875a73c05c</Sha>
</Dependency>
<!-- Listed as a dependency to workaround https://github.com/dotnet/cli/issues/10528 -->
<Dependency Name="Microsoft.NETCore.Platforms" Version="3.1.1" 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.5" CoherentParentDependency="Microsoft.Extensions.Logging">
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="3.1.6" CoherentParentDependency="Microsoft.Extensions.Logging">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup</Uri>
<Sha>65cd7897774a464b5991c1962f7a0d476bb63101</Sha>
<Sha>3acd9b0cd16596bad450c82be08780875a73c05c</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
18 changes: 9 additions & 9 deletions eng/Versions.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,16 +47,16 @@
-->
<PropertyGroup Label="Automated">
<MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>3.1.5-servicing.20270.9</MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>
<MicrosoftAspNetCoreTestingPackageVersion>3.1.5-servicing.20270.9</MicrosoftAspNetCoreTestingPackageVersion>
<MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>3.1.5-servicing.20270.9</MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>
<MicrosoftExtensionsDependencyModelPackageVersion>3.1.5</MicrosoftExtensionsDependencyModelPackageVersion>
<MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>3.1.5-servicing.20270.9</MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>
<MicrosoftExtensionsLoggingPackageVersion>3.1.5</MicrosoftExtensionsLoggingPackageVersion>
<MicrosoftExtensionsNonCapturingTimerSourcesPackageVersion>3.1.5-servicing.20270.9</MicrosoftExtensionsNonCapturingTimerSourcesPackageVersion>
<MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>3.1.6-servicing.20316.5</MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>
<MicrosoftAspNetCoreTestingPackageVersion>3.1.6-servicing.20316.5</MicrosoftAspNetCoreTestingPackageVersion>
<MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>3.1.6-servicing.20316.5</MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>
<MicrosoftExtensionsDependencyModelPackageVersion>3.1.6</MicrosoftExtensionsDependencyModelPackageVersion>
<MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>3.1.6-servicing.20316.5</MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>
<MicrosoftExtensionsLoggingPackageVersion>3.1.6</MicrosoftExtensionsLoggingPackageVersion>
<MicrosoftExtensionsNonCapturingTimerSourcesPackageVersion>3.1.6-servicing.20316.5</MicrosoftExtensionsNonCapturingTimerSourcesPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>3.1.0</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>3.1.5</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreAppInternalPackageVersion>3.1.5-servicing.20270.5</MicrosoftNETCoreAppInternalPackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>3.1.6</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreAppInternalPackageVersion>3.1.6-servicing.20316.4</MicrosoftNETCoreAppInternalPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>3.1.1</MicrosoftNETCorePlatformsPackageVersion>
<SystemTextJsonPackageVersion>4.7.2</SystemTextJsonPackageVersion>
<SystemDiagnosticsDiagnosticSourcePackageVersion>4.7.1</SystemDiagnosticsDiagnosticSourcePackageVersion>
Expand Down

0 comments on commit d63ec4a

Please sign in to comment.