Skip to content

Commit

Permalink
Merged PR 34134: [internal/release/frameshift/6.0] Update dependencie…
Browse files Browse the repository at this point in the history 
…s from dnceng/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.23-servicing.23479.5 to 6.0.23-servicing.23480.2 (parent: Microsoft.Private.Winforms)
  - **Microsoft.NETCore.ILAsm**: from 6.0.23-servicing.23479.5 to 6.0.23-servicing.23480.2 (parent: Microsoft.Private.Winforms)
  - **Microsoft.NETCore.App.Ref**: from 6.0.23 to 6.0.23 (parent: Microsoft.Private.Winforms)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.23 to 6.0.23 (parent: Microsoft.Private.Winforms)
  - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.23-servicing.23479.5 to 6.0.23-servicing.23480.2 (parent: Microsoft.Private.Winforms)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:15230ce7-27e5-40cc-f450-08dbbf39d6ab)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-winforms
- **Subscription**: 15230ce7-27e5-40cc-f450-08dbbf39d6ab
- **Build**: 20230930.3
- **Date Produced**: September 30, 2023 2:46:26 PM UTC
- **Commit**: a8ba4b39b59ca421254550010de48b33d7c7b57d
- **Branch**: refs/heads/internal/release/frameshift/6.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.23-servicing.23479.10 to 6.0.23-servicing.23480.3][1]
  - **Microsoft.Private.Winforms**: [from 6.0.23-servicing.23479.10 to 6.0.23-servicing.23480.3][1]
  - **Microsoft.NETCore.ILDAsm**: [from 6.0.23-servicing.23479.5 to 6.0.23-servicing.23480.2][2]
  - **Microsoft.NETCore.ILAsm**: [from 6.0.23-servicing.23479.5 to 6.0.23-servicing.23480.2][2]
  - **Microsoft.NETCore.App.Ref**: [from 6.0.23 to 6.0.23][2]
  - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.23 to 6.0.23][2]
  - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.23-servicing.23479.5 to 6.0.23-servicing.23480.2][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC5589f30c2c&targetVersion=GCa8ba4b39b5&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC301ba1ee5d&targetVersion=GCe0f0de876a&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:15230ce7-27e5-40cc-f450-08dbbf39d6ab)
  • Loading branch information
@dotnet-bot @dkurepa
dotnet-bot authored and dkurepa committed Sep 30, 2023
2 parents 95b3ee1 + ce541c6 commit 2b6f027
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 23 deletions.
4 changes: 2 additions & 2 deletions NuGet.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +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-301ba1e-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-301ba1ee-3/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-e0f0de8" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-e0f0de87/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 @@ -19,7 +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-301ba1e-3" value="true" />
<add key="darc-int-dotnet-runtime-e0f0de8" 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
34 changes: 17 additions & 17 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.23-servicing.23479.10">
<Dependency Name="Microsoft.Private.Winforms" Version="6.0.23-servicing.23480.3">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
<Sha>5589f30c2c75e37b50934791b7f98e26973b03c4</Sha>
<Sha>a8ba4b39b59ca421254550010de48b33d7c7b57d</Sha>
</Dependency>
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.23-servicing.23479.10">
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.23-servicing.23480.3">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
<Sha>5589f30c2c75e37b50934791b7f98e26973b03c4</Sha>
<Sha>a8ba4b39b59ca421254550010de48b33d7c7b57d</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.23-servicing.23479.5" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>301ba1ee5d1cfff28a8866924733603f3adf4936</Sha>
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="6.0.23-servicing.23480.2" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>e0f0de876a67755a2c6cd2dc730c13f5959bdea8</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.ILAsm" Version="6.0.23-servicing.23479.5" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>301ba1ee5d1cfff28a8866924733603f3adf4936</Sha>
<Dependency Name="Microsoft.NETCore.ILAsm" Version="6.0.23-servicing.23480.2" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>e0f0de876a67755a2c6cd2dc730c13f5959bdea8</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.23" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>301ba1ee5d1cfff28a8866924733603f3adf4936</Sha>
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>e0f0de876a67755a2c6cd2dc730c13f5959bdea8</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.23" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>301ba1ee5d1cfff28a8866924733603f3adf4936</Sha>
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>e0f0de876a67755a2c6cd2dc730c13f5959bdea8</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.23-servicing.23479.5" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>301ba1ee5d1cfff28a8866924733603f3adf4936</Sha>
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.23-servicing.23480.2" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>e0f0de876a67755a2c6cd2dc730c13f5959bdea8</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
Expand Down
8 changes: 4 additions & 4 deletions eng/Versions.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,17 @@
</PropertyGroup>
<!-- NuGet Package Versions -->
<PropertyGroup>
<MicrosoftPrivateWinformsVersion>6.0.23-servicing.23479.10</MicrosoftPrivateWinformsVersion>
<MicrosoftPrivateWinformsVersion>6.0.23-servicing.23480.3</MicrosoftPrivateWinformsVersion>
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/coreclr -->
<PropertyGroup>
<MicrosoftNETCoreRuntimeCoreCLRVersion>5.0.0-alpha1.19562.1</MicrosoftNETCoreRuntimeCoreCLRVersion>
<MicrosoftNETCoreILDAsmVersion>6.0.23-servicing.23479.5</MicrosoftNETCoreILDAsmVersion>
<MicrosoftNETCoreILAsmVersion>6.0.23-servicing.23479.5</MicrosoftNETCoreILAsmVersion>
<MicrosoftNETCoreILDAsmVersion>6.0.23-servicing.23480.2</MicrosoftNETCoreILDAsmVersion>
<MicrosoftNETCoreILAsmVersion>6.0.23-servicing.23480.2</MicrosoftNETCoreILAsmVersion>
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/core-setup -->
<PropertyGroup>
<VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.23-servicing.23479.5</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
<VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.23-servicing.23480.2</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
<MicrosoftNETCoreAppRefVersion>6.0.23</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCoreAppRuntimewinx64Version>6.0.23</MicrosoftNETCoreAppRuntimewinx64Version>
<MicrosoftNETCorePlatformsVersion>6.0.11</MicrosoftNETCorePlatformsVersion>
Expand Down

0 comments on commit 2b6f027

Please sign in to comment.