Skip to content

Commit

Permalink
Merged PR 9236: [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.6 to 3.1.7 (parent: Microsoft.Extensions.Logging)
- **Microsoft.Extensions.DependencyModel**: from 3.1.6 to 3.1.3 (parent: Microsoft.Extensions.Logging)
- **Microsoft.NETCore.App.Internal**: from 3.1.6-servicing.20324.2 to 3.1.7-servicing.20371.4 (parent: Microsoft.Extensions.Logging)
- **Microsoft.NETCore.Platforms**: from 3.1.1 to 3.1.2 (parent: Microsoft.NETCore.App.Runtime.win-x64)

[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**: 20200721.8
- **Date Produced**: 7/22/2020 1:01 AM
- **Commit**: 784b0ffaa40779255758ebbb146334da489a4bde
- **Branch**: refs/heads/internal/release/3.1
- **Updates**:
  - **Microsoft.Extensions.CommandLineUtils.Sources**: from 3.1.7-servicing.20366.2 to 3.1.7-servicing.20371.8
  - **Microsoft.AspNetCore.Testing**: from 3.1.7-servicing.20366.2 to 3.1.7-servicing.20371.8
  - **Microsoft.AspNetCore.BenchmarkRunner.Sources**: from 3.1.7-servicing.20366.2 to 3.1.7-servicing.20371.8
  - **Microsoft.Extensions.NonCapturingTimer.Sources**: from 3.1.7-servicing.20366.2 to 3.1.7-servicing.20371.8
  - **Microsoft.Extensions.HashCodeCombiner.Sources**: from 3.1.7-servicing.20366.2 to 3.1.7-servicing.20371.8
  - **Microsoft.Extensions.Logging**: from 3.1.7 to 3.1.7
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 3.1.6 to 3.1.7
  - **Microsoft.Extensions.DependencyModel**: from 3.1.6 to 3.1.3
  - **Microsoft.NETCore.App.Internal**: from 3.1.6-servicing.20324.2 to 3.1.7-servicing.20371.4
  - **Microsoft.NETCore.Platforms**: from 3.1.1 to 3.1.2

[marker]: <> (End:69367bda-f465-40d4-e1e9-08d79559e508)
  • Loading branch information
@dotnet-bot @wtgodbe
dotnet-bot authored and wtgodbe committed Jul 22, 2020
1 parent 15e6130 commit 1c22292
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 31 deletions.
7 changes: 5 additions & 2 deletions NuGet.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,12 @@
<packageSources>
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<add key="darc-pub-dotnet-core-setup-2d163b8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-core-setup-2d163b87/nuget/v3/index.json" />
<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-085e2dd" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-extensions-085e2dda/nuget/v3/index.json" />
<add key="darc-int-dotnet-core-setup-bed3814" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-core-setup-bed38147/nuget/v3/index.json" />
<add key="darc-int-dotnet-extensions-784b0ff" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-extensions-784b0ffa/nuget/v3/index.json" />
<add key="darc-int-dotnet-core-setup-fcfdef8-1" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-core-setup-fcfdef8d-1/nuget/v3/index.json" />
<add key="darc-int-dotnet-core-setup-fcfdef8" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-core-setup-fcfdef8d/nuget/v3/index.json" />
<add key="darc-int-dotnet-corefx-36b8b8e" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-corefx-36b8b8e2/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" />
Expand Down
40 changes: 20 additions & 20 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.7-servicing.20366.2">
<Dependency Name="Microsoft.Extensions.CommandLineUtils.Sources" Version="3.1.7-servicing.20371.8">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
<Sha>085e2ddae5875d6b97c2279715a46f6629c4baba</Sha>
<Sha>784b0ffaa40779255758ebbb146334da489a4bde</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.HashCodeCombiner.Sources" Version="3.1.7-servicing.20366.2">
<Dependency Name="Microsoft.Extensions.HashCodeCombiner.Sources" Version="3.1.7-servicing.20371.8">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
<Sha>085e2ddae5875d6b97c2279715a46f6629c4baba</Sha>
<Sha>784b0ffaa40779255758ebbb146334da489a4bde</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.NonCapturingTimer.Sources" Version="3.1.7-servicing.20366.2">
<Dependency Name="Microsoft.Extensions.NonCapturingTimer.Sources" Version="3.1.7-servicing.20371.8">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
<Sha>085e2ddae5875d6b97c2279715a46f6629c4baba</Sha>
<Sha>784b0ffaa40779255758ebbb146334da489a4bde</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Logging" Version="3.1.7">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
<Sha>085e2ddae5875d6b97c2279715a46f6629c4baba</Sha>
<Sha>784b0ffaa40779255758ebbb146334da489a4bde</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.BenchmarkRunner.Sources" Version="3.1.7-servicing.20366.2">
<Dependency Name="Microsoft.AspNetCore.BenchmarkRunner.Sources" Version="3.1.7-servicing.20371.8">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
<Sha>085e2ddae5875d6b97c2279715a46f6629c4baba</Sha>
<Sha>784b0ffaa40779255758ebbb146334da489a4bde</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.Testing" Version="3.1.7-servicing.20366.2">
<Dependency Name="Microsoft.AspNetCore.Testing" Version="3.1.7-servicing.20371.8">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
<Sha>085e2ddae5875d6b97c2279715a46f6629c4baba</Sha>
<Sha>784b0ffaa40779255758ebbb146334da489a4bde</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,26 +45,26 @@
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>8a3ffed558ddf943c1efa87d693227722d6af094</Sha>
</Dependency>
<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>bed381477994a1fc59f84b39b9e00d34324c858e</Sha>
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="3.1.3" CoherentParentDependency="Microsoft.Extensions.Logging">
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>2d163b87b605fd23ceebfb04484e5ec5f2bffc32</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Internal" Version="3.1.6-servicing.20324.2" CoherentParentDependency="Microsoft.Extensions.Logging">
<Dependency Name="Microsoft.NETCore.App.Internal" Version="3.1.7-servicing.20371.4" CoherentParentDependency="Microsoft.Extensions.Logging">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup</Uri>
<Sha>bed381477994a1fc59f84b39b9e00d34324c858e</Sha>
<Sha>fcfdef8d6ba770e4d7ba9efefe2591d8c33a1fc6</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">
<Dependency Name="Microsoft.NETCore.Platforms" Version="3.1.2" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-corefx</Uri>
<Sha>059a4a19e602494bfbed473dbbb18f2dbfbd0878</Sha>
<Sha>36b8b8e26a8e2e06e000f59e19910d117bf0025b</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.
All Runtime.$rid packages should have the same version.
-->
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="3.1.6" CoherentParentDependency="Microsoft.Extensions.Logging">
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="3.1.7" CoherentParentDependency="Microsoft.Extensions.Logging">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup</Uri>
<Sha>bed381477994a1fc59f84b39b9e00d34324c858e</Sha>
<Sha>fcfdef8d6ba770e4d7ba9efefe2591d8c33a1fc6</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,17 +47,17 @@
-->
<PropertyGroup Label="Automated">
<MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>3.1.7-servicing.20366.2</MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>
<MicrosoftAspNetCoreTestingPackageVersion>3.1.7-servicing.20366.2</MicrosoftAspNetCoreTestingPackageVersion>
<MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>3.1.7-servicing.20366.2</MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>
<MicrosoftExtensionsDependencyModelPackageVersion>3.1.6</MicrosoftExtensionsDependencyModelPackageVersion>
<MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>3.1.7-servicing.20366.2</MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>
<MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>3.1.7-servicing.20371.8</MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>
<MicrosoftAspNetCoreTestingPackageVersion>3.1.7-servicing.20371.8</MicrosoftAspNetCoreTestingPackageVersion>
<MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>3.1.7-servicing.20371.8</MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>
<MicrosoftExtensionsDependencyModelPackageVersion>3.1.3</MicrosoftExtensionsDependencyModelPackageVersion>
<MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>3.1.7-servicing.20371.8</MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>
<MicrosoftExtensionsLoggingPackageVersion>3.1.7</MicrosoftExtensionsLoggingPackageVersion>
<MicrosoftExtensionsNonCapturingTimerSourcesPackageVersion>3.1.7-servicing.20366.2</MicrosoftExtensionsNonCapturingTimerSourcesPackageVersion>
<MicrosoftExtensionsNonCapturingTimerSourcesPackageVersion>3.1.7-servicing.20371.8</MicrosoftExtensionsNonCapturingTimerSourcesPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>3.1.0</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>3.1.6</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreAppInternalPackageVersion>3.1.6-servicing.20324.2</MicrosoftNETCoreAppInternalPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>3.1.1</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>3.1.7</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreAppInternalPackageVersion>3.1.7-servicing.20371.4</MicrosoftNETCoreAppInternalPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>3.1.2</MicrosoftNETCorePlatformsPackageVersion>
<SystemTextJsonPackageVersion>4.7.2</SystemTextJsonPackageVersion>
<SystemDiagnosticsDiagnosticSourcePackageVersion>4.7.1</SystemDiagnosticsDiagnosticSourcePackageVersion>
<SystemTextEncodingsWebPackageVersion>4.7.1</SystemTextEncodingsWebPackageVersion>
Expand Down

0 comments on commit 1c22292

Please sign in to comment.