Skip to content

Commit

Permalink
Merged PR 27524: [internal/release/3.1] Update dependencies from dnce…
Browse files Browse the repository at this point in the history
…ng/internal/dotnet-core-setup

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.Platforms**: from 3.1.9 to 3.1.12 (parent: Microsoft.NETCore.App.Runtime.win-x64)

[DependencyUpdate]: <> (End)

[marker]: <> (End:Coherency Updates)

[marker]: <> (Begin:d391dd3c-ce8a-46a9-42ad-08d79559e63d)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup
- **Subscription**: d391dd3c-ce8a-46a9-42ad-08d79559e63d
- **Build**: 20221115.20
- **Date Produced**: November 16, 2022 7:13:12 AM UTC
- **Commit**: f94bb2c3ff432dcc4a6229eca2f978197bf06150
- **Branch**: refs/heads/internal/release/3.1

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.NETCore.App.Internal**: [from 3.1.32-servicing.22558.2 to 3.1.32-servicing.22565.20][1]
  - **Microsoft.NETCore.App.Runtime.win-x64**: [from 3.1.32 to 3.1.32][1]
  - **Microsoft.NETCore.Platforms**: [from 3.1.9 to 3.1.12][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup/branches?baseVersion=GCfb59fb7&targetVersion=GCf94bb2c&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-corefx/branches?baseVersion=GCc2011c5&targetVersion=GCb58ef0a&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:d391dd3c-ce8a-46a9-42ad-08d79559e63d)
  • Loading branch information
dotnet-bot authored and vseanreesermsft committed Nov 16, 2022
2 parents c0f0ea0 + 3539381 commit 86e3800
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 9 deletions.
6 changes: 4 additions & 2 deletions NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-corefx -->
<add key="darc-int-dotnet-corefx-b58ef0a" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-corefx-b58ef0a1/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-corefx -->
<!-- Begin: Package sources from dotnet-core-setup -->
<add key="darc-int-dotnet-core-setup-fb59fb7" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-core-setup-fb59fb7d/nuget/v3/index.json" />
<add key="darc-int-dotnet-core-setup-f94bb2c" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-core-setup-f94bb2c3/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-core-setup -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
<add key="dotnet3.1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json" />
Expand All @@ -17,12 +18,13 @@
<disabledPackageSources>
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-core-setup -->
<add key="darc-int-dotnet-core-setup-fb59fb7" value="true" />
<add key="darc-int-dotnet-core-setup-f94bb2c" value="true" />
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
<add key="darc-int-dotnet-core-setup-0267ad0" value="true" />
<add key="darc-int-dotnet-core-setup-0267ad0" value="true" />
<!-- End: Package sources from dotnet-core-setup -->
<!-- Begin: Package sources from dotnet-corefx -->
<add key="darc-int-dotnet-corefx-b58ef0a" value="true" />
<add key="darc-int-dotnet-corefx-0ea07d1" value="true" />
<add key="darc-int-dotnet-corefx-e0e08bd" value="true" />
<add key="darc-int-dotnet-corefx-e0e08bd" value="true" />
Expand Down
10 changes: 5 additions & 5 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -84,19 +84,19 @@
-->
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="3.1.32">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup</Uri>
<Sha>fb59fb7ddd618892c6e750046269dd4497b5c9ae</Sha>
<Sha>f94bb2c3ff432dcc4a6229eca2f978197bf06150</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="3.1.25">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup</Uri>
<Sha>9165b88e05fc37585aa1c3fc9585b5a7d751bb21</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Internal" Version="3.1.32-servicing.22558.2">
<Dependency Name="Microsoft.NETCore.App.Internal" Version="3.1.32-servicing.22565.20">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup</Uri>
<Sha>fb59fb7ddd618892c6e750046269dd4497b5c9ae</Sha>
<Sha>f94bb2c3ff432dcc4a6229eca2f978197bf06150</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="3.1.9" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
<Dependency Name="Microsoft.NETCore.Platforms" Version="3.1.12" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-corefx</Uri>
<Sha>c2011c5350eba4c83554205d06b9ed97c3fccf05</Sha>
<Sha>b58ef0a19eca6269799664d6288be14b7f0cef3e</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
4 changes: 2 additions & 2 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
<MicrosoftDotNetPlatformAbstractionsPackageVersion>3.1.6</MicrosoftDotNetPlatformAbstractionsPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>3.1.0</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>3.1.32</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreAppInternalPackageVersion>3.1.32-servicing.22558.2</MicrosoftNETCoreAppInternalPackageVersion>
<MicrosoftNETCoreAppInternalPackageVersion>3.1.32-servicing.22565.20</MicrosoftNETCoreAppInternalPackageVersion>
<NETStandardLibraryRefPackageVersion>2.1.0</NETStandardLibraryRefPackageVersion>
<!-- Packages from dotnet/corefx -->
<MicrosoftBclAsyncInterfacesPackageVersion>1.1.1</MicrosoftBclAsyncInterfacesPackageVersion>
Expand All @@ -80,7 +80,7 @@
<SystemTextJsonPackageVersion>4.7.2</SystemTextJsonPackageVersion>
<SystemThreadingChannelsPackageVersion>4.7.1</SystemThreadingChannelsPackageVersion>
<!-- Workaround https://github.com/dotnet/cli/issues/10528-->
<MicrosoftNETCorePlatformsPackageVersion>3.1.9</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>3.1.12</MicrosoftNETCorePlatformsPackageVersion>
<!-- Packages from dotnet/arcade -->
<MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.22512.2</MicrosoftDotNetGenAPIPackageVersion>
<!-- Packages from dotnet/roslyn -->
Expand Down

0 comments on commit 86e3800

Please sign in to comment.