Skip to content

Commit

Permalink
Merged PR 38302: [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.4-servicing.24169.7 to 8.0.4-servicing.24169.11 (parent: Microsoft.DotNet.Wpf.GitHub)
  - **Microsoft.Internal.Runtime.WindowsDesktop.Transport**: from 8.0.4-servicing.24168.10 to 8.0.4-servicing.24169.9 (parent: Microsoft.Private.Winforms)
  - **Microsoft.Private.Winforms**: from 8.0.4-servicing.24169.7 to 8.0.4-servicing.24169.11 (parent: Microsoft.DotNet.Wpf.GitHub)
  - **Microsoft.NETCore.App.Ref**: from 8.0.4 to 8.0.4 (parent: Microsoft.Private.Winforms)
  - **Microsoft.Private.Winforms**: from 8.0.4-servicing.24169.7 to 8.0.4-servicing.24169.11 (parent: Microsoft.DotNet.Wpf.GitHub)
  - **VS.Redist.Common.NetCore.SharedFramework.x64.8.0**: from 8.0.4-servicing.24168.10 to 8.0.4-servicing.24169.9 (parent: Microsoft.Private.Winforms)
  - **Microsoft.Private.Winforms**: from 8.0.4-servicing.24169.7 to 8.0.4-servicing.24169.11 (parent: Microsoft.DotNet.Wpf.GitHub)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 8.0.4 to 8.0.4 (parent: Microsoft.Private.Winforms)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 8.0.4-servicing.24169.7 to 8.0.4-servicing.24169.11 (parent: Microsoft.DotNet.Wpf.GitHub)
  - **Microsoft.Private.Winforms**: from 8.0.4-servicing.24169.7 to 8.0.4-servicing.24169.11 (parent: Microsoft.DotNet.Wpf.GitHub)
  - **Microsoft.Private.Winforms**: from 8.0.4-servicing.24169.7 to 8.0.4-servicing.24169.11 (parent: Microsoft.DotNet.Wpf.GitHub)
  - **Microsoft.Private.Winforms**: from 8.0.4-servicing.24169.7 to 8.0.4-servicing.24169.11 (parent: Microsoft.DotNet.Wpf.GitHub)
  - **Microsoft.Private.Winforms**: from 8.0.4-servicing.24169.7 to 8.0.4-servicing.24169.11 (parent: Microsoft.DotNet.Wpf.GitHub)
  - **Microsoft.Private.Winforms**: from 8.0.4-servicing.24169.7 to 8.0.4-servicing.24169.11 (parent: Microsoft.DotNet.Wpf.GitHub)
  - **Microsoft.Private.Winforms**: from 8.0.4-servicing.24169.7 to 8.0.4-servicing.24169.11 (parent: Microsoft.DotNet.Wpf.GitHub)
  - **Microsoft.Private.Winforms**: from 8.0.4-servicing.24169.7 to 8.0.4-servicing.24169.11 (parent: Microsoft.DotNet.Wpf.GitHub)
  - **Microsoft.Private.Winforms**: from 8.0.4-servicing.24169.7 to 8.0.4-servicing.24169.11 (parent: Microsoft.DotNet.Wpf.GitHub)
  - **Microsoft.Private.Winforms**: from 8.0.4-servicing.24169.7 to 8.0.4-servicing.24169.11 (parent: Microsoft.DotNet.Wpf.GitHub)
  - **Microsoft.Private.Winforms**: from 8.0.4-servicing.24169.7 to 8.0.4-servicing.24169.11 (parent: Microsoft.DotNet.Wp...
  • Loading branch information
dotnet-bot authored and vseanreesermsft committed Mar 20, 2024
2 parents 161450e + 0227640 commit 04094d1
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 27 deletions.
8 changes: 4 additions & 4 deletions NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +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-a1a9440" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-a1a9440b/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-2d7eea2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-2d7eea25/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-winforms -->
<add key="darc-int-dotnet-winforms-1575d70" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-1575d705/nuget/v3/index.json" />
<add key="darc-int-dotnet-winforms-41a4bd6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-41a4bd69/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 @@ -25,10 +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-a1a9440" value="true" />
<add key="darc-int-dotnet-runtime-2d7eea2" value="true" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-winforms -->
<add key="darc-int-dotnet-winforms-1575d70" value="true" />
<add key="darc-int-dotnet-winforms-41a4bd6" 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
34 changes: 17 additions & 17 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.4-servicing.24168.10" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="Microsoft.Internal.Runtime.WindowsDesktop.Transport" Version="8.0.4-servicing.24169.9" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>a1a9440b48374c6d400287abbb56a4ac54d9b02f</Sha>
<Sha>2d7eea252964e69be94cb9c847b371b23e4dd470</Sha>
</Dependency>
<Dependency Name="Microsoft.Private.Winforms" Version="8.0.4-servicing.24169.7" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
<Dependency Name="Microsoft.Private.Winforms" Version="8.0.4-servicing.24169.11" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
<Sha>1575d7056e8952d90f592553e9f00661bc94e81a</Sha>
<Sha>41a4bd690229661e3ec74276ce3f93863b22435b</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Wpf.GitHub" Version="8.0.4-servicing.24169.8">
<Dependency Name="Microsoft.DotNet.Wpf.GitHub" Version="8.0.4-servicing.24169.10">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
<Sha>29ccbeca12c26d35acfea8fd4033168fdc2edcb8</Sha>
<Sha>ebbf01f54996755566db36e2e962ba6364da2ecc</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="8.0.4-servicing.24169.8">
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="8.0.4-servicing.24169.10">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
<Sha>29ccbeca12c26d35acfea8fd4033168fdc2edcb8</Sha>
<Sha>ebbf01f54996755566db36e2e962ba6364da2ecc</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.4" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>a1a9440b48374c6d400287abbb56a4ac54d9b02f</Sha>
<Sha>2d7eea252964e69be94cb9c847b371b23e4dd470</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.4-servicing.24168.10" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.4-servicing.24169.9" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>a1a9440b48374c6d400287abbb56a4ac54d9b02f</Sha>
<Sha>2d7eea252964e69be94cb9c847b371b23e4dd470</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.4" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>a1a9440b48374c6d400287abbb56a4ac54d9b02f</Sha>
<Sha>2d7eea252964e69be94cb9c847b371b23e4dd470</Sha>
</Dependency>
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="8.0.4-servicing.24169.7" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="8.0.4-servicing.24169.11" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
<Sha>1575d7056e8952d90f592553e9f00661bc94e81a</Sha>
<Sha>41a4bd690229661e3ec74276ce3f93863b22435b</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="8.0.4-servicing.24169.8">
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="8.0.4-servicing.24169.10">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
<Sha>29ccbeca12c26d35acfea8fd4033168fdc2edcb8</Sha>
<Sha>ebbf01f54996755566db36e2e962ba6364da2ecc</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.4" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
<Sha>1575d7056e8952d90f592553e9f00661bc94e81a</Sha>
<Sha>41a4bd690229661e3ec74276ce3f93863b22435b</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
Expand Down
12 changes: 6 additions & 6 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<!-- nuget -->
<NugetPackagingVersion>6.2.4</NugetPackagingVersion>
<!-- runtime -->
<MicrosoftInternalRuntimeWindowsDesktopTransportVersion>8.0.4-servicing.24168.10</MicrosoftInternalRuntimeWindowsDesktopTransportVersion>
<MicrosoftInternalRuntimeWindowsDesktopTransportVersion>8.0.4-servicing.24169.9</MicrosoftInternalRuntimeWindowsDesktopTransportVersion>
<MicrosoftNETCoreAppRefVersion>8.0.4</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCoreAppRuntimewinx64Version>8.0.4</MicrosoftNETCoreAppRuntimewinx64Version>
<MicrosoftWin32RegistryAccessControlVersion>8.0.0</MicrosoftWin32RegistryAccessControlVersion>
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.4-servicing.24168.10</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>
<VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.4-servicing.24169.9</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>
<!-- wcf -->
<SystemServiceModelVersion>4.10.0</SystemServiceModelVersion>
<!-- winforms -->
<MicrosoftDotnetWinFormsProjectTemplatesVersion>8.0.4-servicing.24169.7</MicrosoftDotnetWinFormsProjectTemplatesVersion>
<MicrosoftPrivateWinformsVersion>8.0.4-servicing.24169.7</MicrosoftPrivateWinformsVersion>
<MicrosoftDotnetWinFormsProjectTemplatesVersion>8.0.4-servicing.24169.11</MicrosoftDotnetWinFormsProjectTemplatesVersion>
<MicrosoftPrivateWinformsVersion>8.0.4-servicing.24169.11</MicrosoftPrivateWinformsVersion>
<SystemDrawingCommonVersion>8.0.4</SystemDrawingCommonVersion>
<!-- wpf -->
<MicrosoftDotNetWpfGitHubVersion>8.0.4-servicing.24169.8</MicrosoftDotNetWpfGitHubVersion>
<MicrosoftDotNetWpfProjectTemplatesVersion>8.0.4-servicing.24169.8</MicrosoftDotNetWpfProjectTemplatesVersion>
<MicrosoftDotNetWpfGitHubVersion>8.0.4-servicing.24169.10</MicrosoftDotNetWpfGitHubVersion>
<MicrosoftDotNetWpfProjectTemplatesVersion>8.0.4-servicing.24169.10</MicrosoftDotNetWpfProjectTemplatesVersion>
</PropertyGroup>
</Project>

0 comments on commit 04094d1

Please sign in to comment.