Skip to content

Commit 48aeeba

Browse files
dotnet-botvseanreesermsft
dotnet-bot
authored and
vseanreesermsft
committed
Merged PR 16696: [internal/release/3.1] Update dependencies from dnceng/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...
1 parent 0447cf4 commit 48aeeba

File tree

3 files changed

+24
-23
lines changed

3 files changed

+24
-23
lines changed

‎NuGet.config

+4-3
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
<!-- Begin: Package sources from dotnet-corefx -->
77
<!-- End: Package sources from dotnet-corefx -->
88
<!-- Begin: Package sources from dotnet-core-setup -->
9-
<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" />
9+
<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" />
1010
<!-- End: Package sources from dotnet-core-setup -->
1111
<!-- Begin: Package sources from dotnet-extensions -->
12-
<add key="darc-int-dotnet-extensions-783dea4" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-extensions-783dea4c/nuget/v3/index.json" />
12+
<add key="darc-int-dotnet-extensions-9130c4b" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-extensions-9130c4bf/nuget/v3/index.json" />
1313
<!-- End: Package sources from dotnet-extensions -->
1414
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1515
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -25,12 +25,13 @@
2525
<clear />
2626
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
2727
<!-- Begin: Package sources from dotnet-extensions -->
28-
<add key="darc-int-dotnet-extensions-783dea4" value="true" />
28+
<add key="darc-int-dotnet-extensions-9130c4b" value="true" />
2929
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
3030
<add key="darc-int-dotnet-extensions-4210e7d" value="true" />
3131
<add key="darc-int-dotnet-extensions-4210e7d" value="true" />
3232
<!-- End: Package sources from dotnet-extensions -->
3333
<!-- Begin: Package sources from dotnet-core-setup -->
34+
<add key="darc-int-dotnet-core-setup-5d3919d" value="true" />
3435
<add key="darc-int-dotnet-core-setup-8a50231" value="true" />
3536
<add key="darc-int-dotnet-core-setup-7bbff11" value="true" />
3637
<add key="darc-int-dotnet-core-setup-7bbff11" value="true" />

‎eng/Version.Details.xml

+14-14
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
33
<ProductDependencies>
4-
<Dependency Name="Microsoft.Extensions.CommandLineUtils.Sources" Version="3.1.18-servicing.21363.9">
4+
<Dependency Name="Microsoft.Extensions.CommandLineUtils.Sources" Version="3.1.18-servicing.21364.3">
55
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
6-
<Sha>783dea4cf1c159d05137062e98d75f28d548df9a</Sha>
6+
<Sha>9130c4bf47c4920f1f3dffb7504119c367b83808</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.Extensions.HashCodeCombiner.Sources" Version="3.1.18-servicing.21363.9">
8+
<Dependency Name="Microsoft.Extensions.HashCodeCombiner.Sources" Version="3.1.18-servicing.21364.3">
99
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
10-
<Sha>783dea4cf1c159d05137062e98d75f28d548df9a</Sha>
10+
<Sha>9130c4bf47c4920f1f3dffb7504119c367b83808</Sha>
1111
</Dependency>
12-
<Dependency Name="Microsoft.Extensions.NonCapturingTimer.Sources" Version="3.1.18-servicing.21363.9">
12+
<Dependency Name="Microsoft.Extensions.NonCapturingTimer.Sources" Version="3.1.18-servicing.21364.3">
1313
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
14-
<Sha>783dea4cf1c159d05137062e98d75f28d548df9a</Sha>
14+
<Sha>9130c4bf47c4920f1f3dffb7504119c367b83808</Sha>
1515
</Dependency>
1616
<Dependency Name="Microsoft.Extensions.Logging" Version="3.1.18">
1717
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
18-
<Sha>783dea4cf1c159d05137062e98d75f28d548df9a</Sha>
18+
<Sha>9130c4bf47c4920f1f3dffb7504119c367b83808</Sha>
1919
</Dependency>
20-
<Dependency Name="Microsoft.AspNetCore.BenchmarkRunner.Sources" Version="3.1.18-servicing.21363.9">
20+
<Dependency Name="Microsoft.AspNetCore.BenchmarkRunner.Sources" Version="3.1.18-servicing.21364.3">
2121
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
22-
<Sha>783dea4cf1c159d05137062e98d75f28d548df9a</Sha>
22+
<Sha>9130c4bf47c4920f1f3dffb7504119c367b83808</Sha>
2323
</Dependency>
24-
<Dependency Name="Microsoft.AspNetCore.Testing" Version="3.1.18-servicing.21363.9">
24+
<Dependency Name="Microsoft.AspNetCore.Testing" Version="3.1.18-servicing.21364.3">
2525
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
26-
<Sha>783dea4cf1c159d05137062e98d75f28d548df9a</Sha>
26+
<Sha>9130c4bf47c4920f1f3dffb7504119c367b83808</Sha>
2727
</Dependency>
2828
<Dependency Name="System.Text.Json" Version="4.7.2" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
2929
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-corefx</Uri>
@@ -49,9 +49,9 @@
4949
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup</Uri>
5050
<Sha>3acd9b0cd16596bad450c82be08780875a73c05c</Sha>
5151
</Dependency>
52-
<Dependency Name="Microsoft.NETCore.App.Internal" Version="3.1.18-servicing.21363.6" CoherentParentDependency="Microsoft.Extensions.Logging">
52+
<Dependency Name="Microsoft.NETCore.App.Internal" Version="3.1.18-servicing.21364.2" CoherentParentDependency="Microsoft.Extensions.Logging">
5353
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup</Uri>
54-
<Sha>8a5023112d98ab3a1410126633749ad0e0a172c0</Sha>
54+
<Sha>5d3919d34e0d8940ee50c36d823ddc28d6b1723c</Sha>
5555
</Dependency>
5656
<!-- Listed as a dependency to workaround https://github.com/dotnet/cli/issues/10528 -->
5757
<Dependency Name="Microsoft.NETCore.Platforms" Version="3.1.7" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
@@ -64,7 +64,7 @@
6464
-->
6565
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="3.1.18" CoherentParentDependency="Microsoft.Extensions.Logging">
6666
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup</Uri>
67-
<Sha>8a5023112d98ab3a1410126633749ad0e0a172c0</Sha>
67+
<Sha>5d3919d34e0d8940ee50c36d823ddc28d6b1723c</Sha>
6868
</Dependency>
6969
<!-- Keep this dependency at the bottom of ProductDependencies, else it will be picked as the parent for CoherentParentDependencies -->
7070
<Dependency Name="Microsoft.NETCore.App.Ref" Version="3.1.0" Pinned="true">

‎eng/Versions.props

+6-6
Original file line numberDiff line numberDiff line change
@@ -47,16 +47,16 @@
4747
4848
-->
4949
<PropertyGroup Label="Automated">
50-
<MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>3.1.18-servicing.21363.9</MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>
51-
<MicrosoftAspNetCoreTestingPackageVersion>3.1.18-servicing.21363.9</MicrosoftAspNetCoreTestingPackageVersion>
52-
<MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>3.1.18-servicing.21363.9</MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>
50+
<MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>3.1.18-servicing.21364.3</MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>
51+
<MicrosoftAspNetCoreTestingPackageVersion>3.1.18-servicing.21364.3</MicrosoftAspNetCoreTestingPackageVersion>
52+
<MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>3.1.18-servicing.21364.3</MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>
5353
<MicrosoftExtensionsDependencyModelPackageVersion>3.1.6</MicrosoftExtensionsDependencyModelPackageVersion>
54-
<MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>3.1.18-servicing.21363.9</MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>
54+
<MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>3.1.18-servicing.21364.3</MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>
5555
<MicrosoftExtensionsLoggingPackageVersion>3.1.18</MicrosoftExtensionsLoggingPackageVersion>
56-
<MicrosoftExtensionsNonCapturingTimerSourcesPackageVersion>3.1.18-servicing.21363.9</MicrosoftExtensionsNonCapturingTimerSourcesPackageVersion>
56+
<MicrosoftExtensionsNonCapturingTimerSourcesPackageVersion>3.1.18-servicing.21364.3</MicrosoftExtensionsNonCapturingTimerSourcesPackageVersion>
5757
<MicrosoftNETCoreAppRefPackageVersion>3.1.0</MicrosoftNETCoreAppRefPackageVersion>
5858
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>3.1.18</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
59-
<MicrosoftNETCoreAppInternalPackageVersion>3.1.18-servicing.21363.6</MicrosoftNETCoreAppInternalPackageVersion>
59+
<MicrosoftNETCoreAppInternalPackageVersion>3.1.18-servicing.21364.2</MicrosoftNETCoreAppInternalPackageVersion>
6060
<MicrosoftNETCorePlatformsPackageVersion>3.1.7</MicrosoftNETCorePlatformsPackageVersion>
6161
<SystemTextJsonPackageVersion>4.7.2</SystemTextJsonPackageVersion>
6262
<SystemDiagnosticsDiagnosticSourcePackageVersion>4.7.1</SystemDiagnosticsDiagnosticSourcePackageVersion>

0 commit comments

Comments
 (0)