Skip to content

Commit 50c266c

Browse files
dotnet-botvseanreesermsft
dotnet-bot
authored and
vseanreesermsft
committed
Merged PR 26462: [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.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] [...
2 parents e6ce839 + 8068d74 commit 50c266c

File tree

3 files changed

+30
-27
lines changed

3 files changed

+30
-27
lines changed

‎NuGet.config

+6-3
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,11 @@
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-6ea7191" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-core-setup-6ea71919/nuget/v3/index.json" />
9+
<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" />
10+
<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" />
1011
<!-- End: Package sources from dotnet-core-setup -->
1112
<!-- Begin: Package sources from dotnet-extensions -->
12-
<add key="darc-int-dotnet-extensions-c62ee3d" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-extensions-c62ee3d0/nuget/v3/index.json" />
13+
<add key="darc-int-dotnet-extensions-cc9959c" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-extensions-cc9959c7/nuget/v3/index.json" />
1314
<!-- End: Package sources from dotnet-extensions -->
1415
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1516
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -25,12 +26,14 @@
2526
<clear />
2627
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
2728
<!-- Begin: Package sources from dotnet-extensions -->
28-
<add key="darc-int-dotnet-extensions-c62ee3d" value="true" />
29+
<add key="darc-int-dotnet-extensions-cc9959c" value="true" />
2930
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
3031
<add key="darc-int-dotnet-extensions-4210e7d" value="true" />
3132
<add key="darc-int-dotnet-extensions-4210e7d" value="true" />
3233
<!-- End: Package sources from dotnet-extensions -->
3334
<!-- Begin: Package sources from dotnet-core-setup -->
35+
<add key="darc-int-dotnet-core-setup-0e404aa-1" value="true" />
36+
<add key="darc-int-dotnet-core-setup-0e404aa" value="true" />
3437
<add key="darc-int-dotnet-core-setup-6ea7191" value="true" />
3538
<add key="darc-int-dotnet-core-setup-e96b8e2" value="true" />
3639
<add key="darc-int-dotnet-core-setup-3f2ca30" value="true" />

‎eng/Version.Details.xml

+16-16
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.30-servicing.22476.2">
4+
<Dependency Name="Microsoft.Extensions.CommandLineUtils.Sources" Version="3.1.31-servicing.22514.1">
55
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
6-
<Sha>c62ee3d0c9492db518f79bf5e4d364bce7c78c66</Sha>
6+
<Sha>cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.Extensions.HashCodeCombiner.Sources" Version="3.1.30-servicing.22476.2">
8+
<Dependency Name="Microsoft.Extensions.HashCodeCombiner.Sources" Version="3.1.31-servicing.22514.1">
99
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
10-
<Sha>c62ee3d0c9492db518f79bf5e4d364bce7c78c66</Sha>
10+
<Sha>cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b</Sha>
1111
</Dependency>
12-
<Dependency Name="Microsoft.Extensions.NonCapturingTimer.Sources" Version="3.1.30-servicing.22476.2">
12+
<Dependency Name="Microsoft.Extensions.NonCapturingTimer.Sources" Version="3.1.31-servicing.22514.1">
1313
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
14-
<Sha>c62ee3d0c9492db518f79bf5e4d364bce7c78c66</Sha>
14+
<Sha>cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b</Sha>
1515
</Dependency>
16-
<Dependency Name="Microsoft.Extensions.Logging" Version="3.1.30">
16+
<Dependency Name="Microsoft.Extensions.Logging" Version="3.1.31">
1717
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
18-
<Sha>c62ee3d0c9492db518f79bf5e4d364bce7c78c66</Sha>
18+
<Sha>cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b</Sha>
1919
</Dependency>
20-
<Dependency Name="Microsoft.AspNetCore.BenchmarkRunner.Sources" Version="3.1.30-servicing.22476.2">
20+
<Dependency Name="Microsoft.AspNetCore.BenchmarkRunner.Sources" Version="3.1.31-servicing.22514.1">
2121
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
22-
<Sha>c62ee3d0c9492db518f79bf5e4d364bce7c78c66</Sha>
22+
<Sha>cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b</Sha>
2323
</Dependency>
24-
<Dependency Name="Microsoft.AspNetCore.Testing" Version="3.1.30-servicing.22476.2">
24+
<Dependency Name="Microsoft.AspNetCore.Testing" Version="3.1.31-servicing.22514.1">
2525
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
26-
<Sha>c62ee3d0c9492db518f79bf5e4d364bce7c78c66</Sha>
26+
<Sha>cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b</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>9165b88e05fc37585aa1c3fc9585b5a7d751bb21</Sha>
5151
</Dependency>
52-
<Dependency Name="Microsoft.NETCore.App.Internal" Version="3.1.30-servicing.22476.9" CoherentParentDependency="Microsoft.Extensions.Logging">
52+
<Dependency Name="Microsoft.NETCore.App.Internal" Version="3.1.31-servicing.22513.7" CoherentParentDependency="Microsoft.Extensions.Logging">
5353
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup</Uri>
54-
<Sha>6ea71919a5bbed566449efe09e953e78abcc5363</Sha>
54+
<Sha>0e404aa9b868b6ad67321cb3a0a6161c25b966d4</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.9" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
@@ -62,9 +62,9 @@
6262
Win-x64 is used here because we have picked an arbitrary runtime identifier to flow the version of the latest NETCore.App runtime.
6363
All Runtime.$rid packages should have the same version.
6464
-->
65-
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="3.1.30" CoherentParentDependency="Microsoft.Extensions.Logging">
65+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="3.1.31" CoherentParentDependency="Microsoft.Extensions.Logging">
6666
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup</Uri>
67-
<Sha>6ea71919a5bbed566449efe09e953e78abcc5363</Sha>
67+
<Sha>0e404aa9b868b6ad67321cb3a0a6161c25b966d4</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

+8-8
Original file line numberDiff line numberDiff line change
@@ -47,16 +47,16 @@
4747
4848
-->
4949
<PropertyGroup Label="Automated">
50-
<MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>3.1.30-servicing.22476.2</MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>
51-
<MicrosoftAspNetCoreTestingPackageVersion>3.1.30-servicing.22476.2</MicrosoftAspNetCoreTestingPackageVersion>
52-
<MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>3.1.30-servicing.22476.2</MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>
50+
<MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>3.1.31-servicing.22514.1</MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>
51+
<MicrosoftAspNetCoreTestingPackageVersion>3.1.31-servicing.22514.1</MicrosoftAspNetCoreTestingPackageVersion>
52+
<MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>3.1.31-servicing.22514.1</MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>
5353
<MicrosoftExtensionsDependencyModelPackageVersion>3.1.25</MicrosoftExtensionsDependencyModelPackageVersion>
54-
<MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>3.1.30-servicing.22476.2</MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>
55-
<MicrosoftExtensionsLoggingPackageVersion>3.1.30</MicrosoftExtensionsLoggingPackageVersion>
56-
<MicrosoftExtensionsNonCapturingTimerSourcesPackageVersion>3.1.30-servicing.22476.2</MicrosoftExtensionsNonCapturingTimerSourcesPackageVersion>
54+
<MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>3.1.31-servicing.22514.1</MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>
55+
<MicrosoftExtensionsLoggingPackageVersion>3.1.31</MicrosoftExtensionsLoggingPackageVersion>
56+
<MicrosoftExtensionsNonCapturingTimerSourcesPackageVersion>3.1.31-servicing.22514.1</MicrosoftExtensionsNonCapturingTimerSourcesPackageVersion>
5757
<MicrosoftNETCoreAppRefPackageVersion>3.1.0</MicrosoftNETCoreAppRefPackageVersion>
58-
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>3.1.30</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
59-
<MicrosoftNETCoreAppInternalPackageVersion>3.1.30-servicing.22476.9</MicrosoftNETCoreAppInternalPackageVersion>
58+
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>3.1.31</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
59+
<MicrosoftNETCoreAppInternalPackageVersion>3.1.31-servicing.22513.7</MicrosoftNETCoreAppInternalPackageVersion>
6060
<MicrosoftNETCorePlatformsPackageVersion>3.1.9</MicrosoftNETCorePlatformsPackageVersion>
6161
<SystemTextJsonPackageVersion>4.7.2</SystemTextJsonPackageVersion>
6262
<SystemDiagnosticsDiagnosticSourcePackageVersion>4.7.1</SystemDiagnosticsDiagnosticSourcePackageVersion>

0 commit comments

Comments
 (0)