Skip to content

Commit

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

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.Private.Winforms**: from 8.0.2-servicing.24060.4 to 8.0.2-servicing.24068.3 (parent: Microsoft.DotNet.Wpf.GitHub)
  - **Microsoft.Internal.Runtime.WindowsDesktop.Transport**: from 8.0.1-servicing.23580.1 to 8.0.2-servicing.24067.11 (parent: Microsoft.Private.Winforms)
  - **Microsoft.Private.Winforms**: from 8.0.2-servicing.24060.4 to 8.0.2-servicing.24068.3 (parent: Microsoft.DotNet.Wpf.GitHub)
  - **Microsoft.NETCore.App.Ref**: from 8.0.1 to 8.0.2 (parent: Microsoft.Private.Winforms)
  - **Microsoft.Private.Winforms**: from 8.0.2-servicing.24060.4 to 8.0.2-servicing.24068.3 (parent: Microsoft.DotNet.Wpf.GitHub)
  - **VS.Redist.Common.NetCore.SharedFramework.x64.8.0**: from 8.0.1-servicing.23580.1 to 8.0.2-servicing.24067.11 (parent: Microsoft.Private.Winforms)
  - **Microsoft.Private.Winforms**: from 8.0.2-servicing.24060.4 to 8.0.2-servicing.24068.3 (parent: Microsoft.DotNet.Wpf.GitHub)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 8.0.1 to 8.0.2 (parent: Microsoft.Private.Winforms)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 8.0.2-servicing.24060.4 to 8.0.2-servicing.24068.3 (parent: Microsoft.DotNet.Wpf.GitHub)
  - **Microsoft.Private.Winforms**: from 8.0.2-servicing.24060.4 to 8.0.2-servicing.24068.3 (parent: Microsoft.DotNet.Wpf.GitHub)
  - **Microsoft.Private.Winforms**: from 8.0.2-servicing.24060.4 to 8.0.2-servicing.24068.3 (parent: Microsoft.DotNet.Wpf.GitHub)
  - **Microsoft.Private.Winforms**: from 8.0.2-servicing.24060.4 to 8.0.2-servicing.24068.3 (parent: Microsoft.DotNet.Wpf.GitHub)
  - **Microsoft.Private.Winforms**: from 8.0.2-servicing.24060.4 to 8.0.2-servicing.24068.3 (parent: Microsoft.DotNet.Wpf.GitHub)
  - **Microsoft.Private.Winforms**: from 8.0.2-servicing.24060.4 to 8.0.2-servicing.24068.3 (parent: Microsoft.DotNet.Wpf.GitHub)
  - **Microsoft.Private.Winforms**: from 8.0.2-servicing.24060.4 to 8.0.2-servicing.24068.3 (parent: Microsoft.DotNet.Wpf.GitHub)
  - **Microsoft.Private.Winforms**: from 8.0.2-servicing.24060.4 to 8.0.2-servicing.24068.3 (parent: Microsoft.DotNet.Wpf.GitHub)
  - **Microsoft.Private.Winforms**: from 8.0.2-servicing.24060.4 to 8.0.2-servicing.24068.3 (parent: Microsoft.DotNet.Wpf.GitHub)
  - **Microsoft.Private.Winforms**: from 8.0.2-servicing.24060.4 to 8.0.2-servicing.24068.3 (parent: Microsoft.DotNet.Wpf.GitHub)
  - **Microsoft.Private.Winforms**: from 8.0.2-servicing.24060.4 to 8.0.2-servicing.24068.3 (parent: Microsoft.DotNet.Wpf.GitHub)
  - ...
  • Loading branch information
dotnet-bot authored and vseanreesermsft committed Jan 18, 2024
2 parents d409dda + fb4f6ef commit 593444a
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 35 deletions.
12 changes: 4 additions & 8 deletions NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,10 @@
<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-bf5e279" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-bf5e279d/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-bf5e279-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-bf5e279d-2/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-bf5e279-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-bf5e279d-1/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-1381d5e" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-1381d5eb/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-winforms -->
<add key="darc-int-dotnet-winforms-35307d0" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-35307d0f/nuget/v3/index.json" />
<add key="darc-int-dotnet-winforms-c58fa00" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-c58fa00b/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-winforms -->
<!--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 @@ -27,12 +25,10 @@
<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-bf5e279-1" value="true" />
<add key="darc-int-dotnet-runtime-bf5e279-2" value="true" />
<add key="darc-int-dotnet-runtime-bf5e279" value="true" />
<add key="darc-int-dotnet-runtime-1381d5e" value="true" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-winforms -->
<add key="darc-int-dotnet-winforms-35307d0" value="true" />
<add key="darc-int-dotnet-winforms-c58fa00" value="true" />
<!-- End: Package sources from dotnet-winforms -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
</disabledPackageSources>
Expand Down
38 changes: 19 additions & 19 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,41 +1,41 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.Internal.Runtime.WindowsDesktop.Transport" Version="8.0.1-servicing.23580.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="Microsoft.Internal.Runtime.WindowsDesktop.Transport" Version="8.0.2-servicing.24067.11" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>bf5e279d9239bfef5bb1b8d6212f1b971c434606</Sha>
<Sha>1381d5ebd2ab1f292848d5b19b80cf71ac332508</Sha>
</Dependency>
<Dependency Name="Microsoft.Private.Winforms" Version="8.0.2-servicing.24060.4" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
<Dependency Name="Microsoft.Private.Winforms" Version="8.0.2-servicing.24068.3" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
<Sha>35307d0f7a7381a850bde13723241862ba824b3f</Sha>
<Sha>c58fa00bd16b92aab1d7fb2b93e71af6a7768139</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Wpf.GitHub" Version="8.0.2-servicing.24060.15">
<Dependency Name="Microsoft.DotNet.Wpf.GitHub" Version="8.0.2-servicing.24068.6">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
<Sha>4c5c25180f2937b7c0691483dc892169fc13ddb3</Sha>
<Sha>472140dd926227876848e48f41cfc9acb9275492</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="8.0.2-servicing.24060.15">
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="8.0.2-servicing.24068.6">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
<Sha>4c5c25180f2937b7c0691483dc892169fc13ddb3</Sha>
<Sha>472140dd926227876848e48f41cfc9acb9275492</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.2" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>bf5e279d9239bfef5bb1b8d6212f1b971c434606</Sha>
<Sha>1381d5ebd2ab1f292848d5b19b80cf71ac332508</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.1-servicing.23580.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.2-servicing.24067.11" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>bf5e279d9239bfef5bb1b8d6212f1b971c434606</Sha>
<Sha>1381d5ebd2ab1f292848d5b19b80cf71ac332508</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.2" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>bf5e279d9239bfef5bb1b8d6212f1b971c434606</Sha>
<Sha>1381d5ebd2ab1f292848d5b19b80cf71ac332508</Sha>
</Dependency>
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="8.0.2-servicing.24060.4" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="8.0.2-servicing.24068.3" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
<Sha>35307d0f7a7381a850bde13723241862ba824b3f</Sha>
<Sha>c58fa00bd16b92aab1d7fb2b93e71af6a7768139</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="8.0.2-servicing.24060.15">
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="8.0.2-servicing.24068.6">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
<Sha>4c5c25180f2937b7c0691483dc892169fc13ddb3</Sha>
<Sha>472140dd926227876848e48f41cfc9acb9275492</Sha>
</Dependency>
<Dependency Name="Microsoft.Win32.Registry.AccessControl" Version="8.0.0" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
Expand Down Expand Up @@ -147,7 +147,7 @@
</Dependency>
<Dependency Name="System.Drawing.Common" Version="8.0.2" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
<Sha>35307d0f7a7381a850bde13723241862ba824b3f</Sha>
<Sha>c58fa00bd16b92aab1d7fb2b93e71af6a7768139</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
Expand Down
16 changes: 8 additions & 8 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@
<!-- nuget -->
<NugetPackagingVersion>6.2.4</NugetPackagingVersion>
<!-- runtime -->
<MicrosoftInternalRuntimeWindowsDesktopTransportVersion>8.0.1-servicing.23580.1</MicrosoftInternalRuntimeWindowsDesktopTransportVersion>
<MicrosoftNETCoreAppRefVersion>8.0.1</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCoreAppRuntimewinx64Version>8.0.1</MicrosoftNETCoreAppRuntimewinx64Version>
<MicrosoftInternalRuntimeWindowsDesktopTransportVersion>8.0.2-servicing.24067.11</MicrosoftInternalRuntimeWindowsDesktopTransportVersion>
<MicrosoftNETCoreAppRefVersion>8.0.2</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCoreAppRuntimewinx64Version>8.0.2</MicrosoftNETCoreAppRuntimewinx64Version>
<MicrosoftWin32RegistryAccessControlVersion>8.0.0</MicrosoftWin32RegistryAccessControlVersion>
<MicrosoftWin32RegistryVersion>5.0.0</MicrosoftWin32RegistryVersion>
<MicrosoftWin32SystemEventsVersion>8.0.0</MicrosoftWin32SystemEventsVersion>
Expand Down Expand Up @@ -61,15 +61,15 @@
<SystemSpeechVersion>8.0.0</SystemSpeechVersion>
<SystemTextEncodingCodePagesVersion>8.0.0</SystemTextEncodingCodePagesVersion>
<SystemThreadingAccessControlVersion>8.0.0</SystemThreadingAccessControlVersion>
<VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.1-servicing.23580.1</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>
<VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.2-servicing.24067.11</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>
<!-- wcf -->
<SystemServiceModelVersion>4.10.0</SystemServiceModelVersion>
<!-- winforms -->
<MicrosoftDotnetWinFormsProjectTemplatesVersion>8.0.2-servicing.24060.4</MicrosoftDotnetWinFormsProjectTemplatesVersion>
<MicrosoftPrivateWinformsVersion>8.0.2-servicing.24060.4</MicrosoftPrivateWinformsVersion>
<MicrosoftDotnetWinFormsProjectTemplatesVersion>8.0.2-servicing.24068.3</MicrosoftDotnetWinFormsProjectTemplatesVersion>
<MicrosoftPrivateWinformsVersion>8.0.2-servicing.24068.3</MicrosoftPrivateWinformsVersion>
<SystemDrawingCommonVersion>8.0.2</SystemDrawingCommonVersion>
<!-- wpf -->
<MicrosoftDotNetWpfGitHubVersion>8.0.2-servicing.24060.15</MicrosoftDotNetWpfGitHubVersion>
<MicrosoftDotNetWpfProjectTemplatesVersion>8.0.2-servicing.24060.15</MicrosoftDotNetWpfProjectTemplatesVersion>
<MicrosoftDotNetWpfGitHubVersion>8.0.2-servicing.24068.6</MicrosoftDotNetWpfGitHubVersion>
<MicrosoftDotNetWpfProjectTemplatesVersion>8.0.2-servicing.24068.6</MicrosoftDotNetWpfProjectTemplatesVersion>
</PropertyGroup>
</Project>

0 comments on commit 593444a

Please sign in to comment.