Skip to content

Commit

Permalink
Merged PR 38997: [internal/release/6.0] Update dependencies from dnce…
Browse files Browse the repository at this point in the history 
…ng/internal/dotnet-winforms

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.ILDAsm**: from 6.0.29-servicing.24171.5 to 6.0.30-servicing.24215.25 (parent: Microsoft.Private.Winforms)
  - **Microsoft.NETCore.ILAsm**: from 6.0.29-servicing.24171.5 to 6.0.30-servicing.24215.25 (parent: Microsoft.Private.Winforms)
  - **Microsoft.NETCore.App.Ref**: from 6.0.29 to 6.0.30 (parent: Microsoft.Private.Winforms)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.29 to 6.0.30 (parent: Microsoft.Private.Winforms)
  - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.29-servicing.24171.5 to 6.0.30-servicing.24215.25 (parent: Microsoft.Private.Winforms)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:a88d6455-e128-4280-39b4-08d960f4ca81)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-winforms
- **Subscription**: a88d6455-e128-4280-39b4-08d960f4ca81
- **Build**: 20240416.19
- **Date Produced**: April 16, 2024 11:16:24 PM UTC
- **Commit**: 431a1dcb7d4eafa215951499ad374ffde8622e61
- **Branch**: refs/heads/internal/release/6.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.29-servicing.24171.6 to 6.0.30-servicing.24216.19][1]
  - **Microsoft.Private.Winforms**: [from 6.0.29-servicing.24171.6 to 6.0.30-servicing.24216.19][1]
  - **Microsoft.NETCore.ILDAsm**: [from 6.0.29-servicing.24171.5 to 6.0.30-servicing.24215.25][2]
  - **Microsoft.NETCore.ILAsm**: [from 6.0.29-servicing.24171.5 to 6.0.30-servicing.24215.25][2]
  - **Microsoft.NETCore.App.Ref**: [from 6.0.29 to 6.0.30][2]
  - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.29 to 6.0.30][2]
  - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.29-servicing.24171.5 to 6.0.30-servicing.24215.25][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC6525c5174ef1b8ee5b29c397e8a4b76e76487927&targetVersion=GC431a1dcb7d4eafa215951499ad374ffde8622e61&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC189fbbd88d97dd6d65515ba2da05b62eab4e5039&targetVersion=GC97d8f4cade971b93794a3805e7d72ee388f14c9b&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:a88d6455-e128-4280-39b4-08d960f4ca81)
  • Loading branch information
@dotnet-bot @vseanreesermsft
dotnet-bot authored and vseanreesermsft committed Apr 16, 2024
1 parent 4d95bad commit dee47a1
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 20 deletions.
2 changes: 2 additions & 0 deletions NuGet.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-97d8f4c" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-97d8f4ca/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-runtime -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
Expand All @@ -18,6 +19,7 @@
<disabledPackageSources>
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-97d8f4c" value="true" />
<!-- End: Package sources from dotnet-runtime -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
</disabledPackageSources>
Expand Down
28 changes: 14 additions & 14 deletions eng/Version.Details.xml
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.Private.Winforms" Version="6.0.29-servicing.24171.6">
<Dependency Name="Microsoft.Private.Winforms" Version="6.0.30-servicing.24216.19">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
<Sha>6525c5174ef1b8ee5b29c397e8a4b76e76487927</Sha>
<Sha>431a1dcb7d4eafa215951499ad374ffde8622e61</Sha>
</Dependency>
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.29-servicing.24171.6">
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.30-servicing.24216.19">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
<Sha>6525c5174ef1b8ee5b29c397e8a4b76e76487927</Sha>
<Sha>431a1dcb7d4eafa215951499ad374ffde8622e61</Sha>
</Dependency>
<Dependency Name="System.CodeDom" Version="6.0.0" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
Expand Down Expand Up @@ -57,29 +57,29 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="6.0.29-servicing.24171.5" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="6.0.30-servicing.24215.25" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>189fbbd88d97dd6d65515ba2da05b62eab4e5039</Sha>
<Sha>97d8f4cade971b93794a3805e7d72ee388f14c9b</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.ILAsm" Version="6.0.29-servicing.24171.5" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="Microsoft.NETCore.ILAsm" Version="6.0.30-servicing.24215.25" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>189fbbd88d97dd6d65515ba2da05b62eab4e5039</Sha>
<Sha>97d8f4cade971b93794a3805e7d72ee388f14c9b</Sha>
</Dependency>
<Dependency Name="System.Resources.Extensions" Version="6.0.0" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.29" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.30" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>189fbbd88d97dd6d65515ba2da05b62eab4e5039</Sha>
<Sha>97d8f4cade971b93794a3805e7d72ee388f14c9b</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.29" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.30" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>189fbbd88d97dd6d65515ba2da05b62eab4e5039</Sha>
<Sha>97d8f4cade971b93794a3805e7d72ee388f14c9b</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.29-servicing.24171.5" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.30-servicing.24215.25" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>189fbbd88d97dd6d65515ba2da05b62eab4e5039</Sha>
<Sha>97d8f4cade971b93794a3805e7d72ee388f14c9b</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
Expand Down
12 changes: 6 additions & 6 deletions eng/Versions.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,19 +26,19 @@
</PropertyGroup>
<!-- NuGet Package Versions -->
<PropertyGroup>
<MicrosoftPrivateWinformsVersion>6.0.29-servicing.24171.6</MicrosoftPrivateWinformsVersion>
<MicrosoftPrivateWinformsVersion>6.0.30-servicing.24216.19</MicrosoftPrivateWinformsVersion>
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/coreclr -->
<PropertyGroup>
<MicrosoftNETCoreRuntimeCoreCLRVersion>5.0.0-alpha1.19562.1</MicrosoftNETCoreRuntimeCoreCLRVersion>
<MicrosoftNETCoreILDAsmVersion>6.0.29-servicing.24171.5</MicrosoftNETCoreILDAsmVersion>
<MicrosoftNETCoreILAsmVersion>6.0.29-servicing.24171.5</MicrosoftNETCoreILAsmVersion>
<MicrosoftNETCoreILDAsmVersion>6.0.30-servicing.24215.25</MicrosoftNETCoreILDAsmVersion>
<MicrosoftNETCoreILAsmVersion>6.0.30-servicing.24215.25</MicrosoftNETCoreILAsmVersion>
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/core-setup -->
<PropertyGroup>
<VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.29-servicing.24171.5</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
<MicrosoftNETCoreAppRefVersion>6.0.29</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCoreAppRuntimewinx64Version>6.0.29</MicrosoftNETCoreAppRuntimewinx64Version>
<VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.30-servicing.24215.25</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
<MicrosoftNETCoreAppRefVersion>6.0.30</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCoreAppRuntimewinx64Version>6.0.30</MicrosoftNETCoreAppRuntimewinx64Version>
<MicrosoftNETCorePlatformsVersion>6.0.13</MicrosoftNETCorePlatformsVersion>
<SystemDrawingCommonVersion>6.0.0</SystemDrawingCommonVersion>
<SystemDirectoryServicesVersion>6.0.1</SystemDirectoryServicesVersion>
Expand Down

0 comments on commit dee47a1

Please sign in to comment.