Skip to content

Commit cc885b4

Browse files
dotnet-botvseanreesermsft
dotnet-bot
authored and
vseanreesermsft
committed
Merged PR 25990: [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.30 (parent: Microsoft.Extensions.Logging) - **Microsoft.NETCore.App.Runtime.win-x64**: from 3.1.30 to 3.1.30 (parent: Microsoft.Extensions.Logging) - **Microsoft.NETCore.App.Runtime.win-x64**: from 3.1.30 to 3.1.30 (parent: Microsoft.Extensions.Logging) - **Microsoft.NETCore.App.Runtime.win-x64**: from 3.1.30 to 3.1.30 (parent: Microsoft.Extensions.Logging) - **Microsoft.NETCore.App.Runtime.win-x64**: from 3.1.30 to 3.1.30 (parent: Microsoft.Extensions.Logging) - **Microsoft.NETCore.App.Internal**: from 3.1.30-servicing.22469.3 to 3.1.30-servicing.22469.7 (parent: Microsoft.Extensions.Logging) - **Microsoft.NETCore.App.Runtime.win-x64**: from 3.1.30 to 3.1.30 (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**: 20220919.6 - **Date Produced**: September 20, 2022 4:12:03 AM UTC - **Commit**: d5cc5b6749b92f4f695d25fa20ef266d4de1a1f0 - **Branch**: refs/heads/internal/release/3.1 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.AspNetCore.BenchmarkRunner.Sources**: [from 3.1.30-servicing.22469.4 to 3.1.30-servicing.22469.6][1] - **Microsoft.AspNetCore.Testing**: [from 3.1.30-servicing.22469.4 to 3.1.30-servicing.22469.6][1] - **Microsoft.Extensions.CommandLineUtils.Sources**: [from 3.1.30-servicing.22469.4 to 3.1.30-servicing.22469.6][1] - **Microsoft.Extensions.HashCodeCombiner.Sources**: [from 3.1.30-servicing.22469.4 to 3.1.30-servicing.22469.6][1] - **Microsoft.Extensions.Logging**: [from 3.1.30 to 3.1.30][1] - **Microsoft.Extensions.NonCapturingTimer.Sources**: [from 3.1.30-servicing.22469.4 to 3.1.30-servicing.22469.6][1] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 3.1.30 to 3.1.30][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 3.1.30 to 3.1.30][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 3.1.30 to 3.1.30][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 3.1.30 to 3.1.30][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 3.1.30 to 3.1.30][2] - **Microsoft.NETCore.App.Internal**: [from 3.1.30-servicing.22469.3 to 3.1.30-servicing.22469.7][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 3.1.30 to 3.1.30][2] [1]...
2 parents f6e7a57 + a468646 commit cc885b4

File tree

3 files changed

+24
-23
lines changed

3 files changed

+24
-23
lines changed

‎NuGet.config

Lines changed: 4 additions & 3 deletions
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-5ae5357" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-core-setup-5ae5357f/nuget/v3/index.json" />
9+
<add key="darc-int-dotnet-core-setup-3f2ca30" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-core-setup-3f2ca303/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-562a504" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-extensions-562a504c/nuget/v3/index.json" />
12+
<add key="darc-int-dotnet-extensions-d5cc5b6" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-extensions-d5cc5b67/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-562a504" value="true" />
28+
<add key="darc-int-dotnet-extensions-d5cc5b6" 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-3f2ca30" value="true" />
3435
<add key="darc-int-dotnet-core-setup-5ae5357" value="true" />
3536
<add key="darc-int-dotnet-core-setup-d501b36" value="true" />
3637
<add key="darc-int-dotnet-core-setup-8634714" value="true" />

‎eng/Version.Details.xml

Lines changed: 14 additions & 14 deletions
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.22469.4">
4+
<Dependency Name="Microsoft.Extensions.CommandLineUtils.Sources" Version="3.1.30-servicing.22469.6">
55
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
6-
<Sha>562a504c09b7de4dca31192fb56c5884aee63a9f</Sha>
6+
<Sha>d5cc5b6749b92f4f695d25fa20ef266d4de1a1f0</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.Extensions.HashCodeCombiner.Sources" Version="3.1.30-servicing.22469.4">
8+
<Dependency Name="Microsoft.Extensions.HashCodeCombiner.Sources" Version="3.1.30-servicing.22469.6">
99
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
10-
<Sha>562a504c09b7de4dca31192fb56c5884aee63a9f</Sha>
10+
<Sha>d5cc5b6749b92f4f695d25fa20ef266d4de1a1f0</Sha>
1111
</Dependency>
12-
<Dependency Name="Microsoft.Extensions.NonCapturingTimer.Sources" Version="3.1.30-servicing.22469.4">
12+
<Dependency Name="Microsoft.Extensions.NonCapturingTimer.Sources" Version="3.1.30-servicing.22469.6">
1313
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
14-
<Sha>562a504c09b7de4dca31192fb56c5884aee63a9f</Sha>
14+
<Sha>d5cc5b6749b92f4f695d25fa20ef266d4de1a1f0</Sha>
1515
</Dependency>
1616
<Dependency Name="Microsoft.Extensions.Logging" Version="3.1.30">
1717
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
18-
<Sha>562a504c09b7de4dca31192fb56c5884aee63a9f</Sha>
18+
<Sha>d5cc5b6749b92f4f695d25fa20ef266d4de1a1f0</Sha>
1919
</Dependency>
20-
<Dependency Name="Microsoft.AspNetCore.BenchmarkRunner.Sources" Version="3.1.30-servicing.22469.4">
20+
<Dependency Name="Microsoft.AspNetCore.BenchmarkRunner.Sources" Version="3.1.30-servicing.22469.6">
2121
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
22-
<Sha>562a504c09b7de4dca31192fb56c5884aee63a9f</Sha>
22+
<Sha>d5cc5b6749b92f4f695d25fa20ef266d4de1a1f0</Sha>
2323
</Dependency>
24-
<Dependency Name="Microsoft.AspNetCore.Testing" Version="3.1.30-servicing.22469.4">
24+
<Dependency Name="Microsoft.AspNetCore.Testing" Version="3.1.30-servicing.22469.6">
2525
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
26-
<Sha>562a504c09b7de4dca31192fb56c5884aee63a9f</Sha>
26+
<Sha>d5cc5b6749b92f4f695d25fa20ef266d4de1a1f0</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.22469.3" CoherentParentDependency="Microsoft.Extensions.Logging">
52+
<Dependency Name="Microsoft.NETCore.App.Internal" Version="3.1.30-servicing.22469.7" CoherentParentDependency="Microsoft.Extensions.Logging">
5353
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup</Uri>
54-
<Sha>5ae5357f2d71a6aeae30b07f218ade7e5af3b7ef</Sha>
54+
<Sha>3f2ca303e5cd6b82d8d370c857fa5518f17d40d2</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">
@@ -64,7 +64,7 @@
6464
-->
6565
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="3.1.30" CoherentParentDependency="Microsoft.Extensions.Logging">
6666
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup</Uri>
67-
<Sha>5ae5357f2d71a6aeae30b07f218ade7e5af3b7ef</Sha>
67+
<Sha>3f2ca303e5cd6b82d8d370c857fa5518f17d40d2</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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,16 +47,16 @@
4747
4848
-->
4949
<PropertyGroup Label="Automated">
50-
<MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>3.1.30-servicing.22469.4</MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>
51-
<MicrosoftAspNetCoreTestingPackageVersion>3.1.30-servicing.22469.4</MicrosoftAspNetCoreTestingPackageVersion>
52-
<MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>3.1.30-servicing.22469.4</MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>
50+
<MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>3.1.30-servicing.22469.6</MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>
51+
<MicrosoftAspNetCoreTestingPackageVersion>3.1.30-servicing.22469.6</MicrosoftAspNetCoreTestingPackageVersion>
52+
<MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>3.1.30-servicing.22469.6</MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>
5353
<MicrosoftExtensionsDependencyModelPackageVersion>3.1.25</MicrosoftExtensionsDependencyModelPackageVersion>
54-
<MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>3.1.30-servicing.22469.4</MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>
54+
<MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>3.1.30-servicing.22469.6</MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>
5555
<MicrosoftExtensionsLoggingPackageVersion>3.1.30</MicrosoftExtensionsLoggingPackageVersion>
56-
<MicrosoftExtensionsNonCapturingTimerSourcesPackageVersion>3.1.30-servicing.22469.4</MicrosoftExtensionsNonCapturingTimerSourcesPackageVersion>
56+
<MicrosoftExtensionsNonCapturingTimerSourcesPackageVersion>3.1.30-servicing.22469.6</MicrosoftExtensionsNonCapturingTimerSourcesPackageVersion>
5757
<MicrosoftNETCoreAppRefPackageVersion>3.1.0</MicrosoftNETCoreAppRefPackageVersion>
5858
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>3.1.30</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
59-
<MicrosoftNETCoreAppInternalPackageVersion>3.1.30-servicing.22469.3</MicrosoftNETCoreAppInternalPackageVersion>
59+
<MicrosoftNETCoreAppInternalPackageVersion>3.1.30-servicing.22469.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)