Skip to content

Commit

Permalink
Merged PR 31537: [internal/release/7.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 7.0.7-servicing.23272.2 to 7.0.7-servicing.23274.5 (parent: Microsoft.DotNet.Wpf.GitHub)
  - **Microsoft.Internal.Runtime.WindowsDesktop.Transport**: from 7.0.7-servicing.23269.6 to 7.0.7-servicing.23274.4 (parent: Microsoft.Private.Winforms)
  - **Microsoft.Private.Winforms**: from 7.0.7-servicing.23272.2 to 7.0.7-servicing.23274.5 (parent: Microsoft.DotNet.Wpf.GitHub)
  - **Microsoft.NETCore.App.Ref**: from 7.0.7 to 7.0.7 (parent: Microsoft.Private.Winforms)
  - **Microsoft.Private.Winforms**: from 7.0.7-servicing.23272.2 to 7.0.7-servicing.23274.5 (parent: Microsoft.DotNet.Wpf.GitHub)
  - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: from 7.0.7-servicing.23269.6 to 7.0.7-servicing.23274.4 (parent: Microsoft.Private.Winforms)
  - **Microsoft.Private.Winforms**: from 7.0.7-servicing.23272.2 to 7.0.7-servicing.23274.5 (parent: Microsoft.DotNet.Wpf.GitHub)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 7.0.7 to 7.0.7 (parent: Microsoft.Private.Winforms)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 7.0.7-servicing.23272.2 to 7.0.7-servicing.23274.5 (parent: Microsoft.DotNet.Wpf.GitHub)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:763b3cc5-38c8-458a-6639-08da7ef6346a)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-wpf
- **Subscription**: 763b3cc5-38c8-458a-6639-08da7ef6346a
- **Build**: 20230524.5
- **Date Produced**: May 25, 2023 5:52:47 AM UTC
- **Commit**: 512eac4b458953da405f51ec0ae7766bcb7b32e5
- **Branch**: refs/heads/internal/release/7.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Wpf.GitHub**: [from 7.0.7-servicing.23272.4 to 7.0.7-servicing.23274.5][1]
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 7.0.7-servicing.23272.4 to 7.0.7-servicing.23274.5][1]
  - **Microsoft.NET.Sdk.WindowsDesktop**: [from 7.0.7-servicing.23272.4 to 7.0.7-servicing.23274.5][1]
  - **Microsoft.Private.Winforms**: [from 7.0.7-servicing.23272.2 to 7.0.7-servicing.23274.5][2]
  - **Microsoft.Internal.Runtime.WindowsDesktop.Transport**: [from 7.0.7-servicing.23269.6 to 7.0.7-servicing.23274.4][3]
  - **Microsoft.Private.Winforms**: [from 7.0.7-servicing.23272.2 to 7.0.7-servicing.23274.5][2]
  - **Microsoft.NETCore.App.Ref**: [from 7.0.7 to 7.0.7][3]
  - **Microsoft.Private.Winforms**: [from 7.0.7-servicing.23272.2 to 7.0.7-servicing.23274.5][2]
  - **VS.Redist.Common.NetCore.SharedFrame...
  • Loading branch information
dotnet-bot authored and mmitche committed May 25, 2023
1 parent 2f39602 commit eacd999
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 24 deletions.
4 changes: 2 additions & 2 deletions NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,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-8e3442d" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-8e3442dd/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-5b20af4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-5b20af47/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 @@ -24,7 +24,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-8e3442d" value="true" />
<add key="darc-int-dotnet-runtime-5b20af4" 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
32 changes: 16 additions & 16 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="7.0.7-servicing.23269.6" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="Microsoft.Internal.Runtime.WindowsDesktop.Transport" Version="7.0.7-servicing.23274.4" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>8e3442dd52923615959c161ce49b9960375ea07b</Sha>
<Sha>5b20af47d99620150c53eaf5db8636fdf730b126</Sha>
</Dependency>
<Dependency Name="Microsoft.Private.Winforms" Version="7.0.7-servicing.23272.2" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
<Dependency Name="Microsoft.Private.Winforms" Version="7.0.7-servicing.23274.5" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
<Sha>e3bf366a7361267ba472521190d62c9d22f39b14</Sha>
<Sha>b4a5f0c6839363dea534f21736a9d0726c14b41c</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Wpf.GitHub" Version="7.0.7-servicing.23272.4">
<Dependency Name="Microsoft.DotNet.Wpf.GitHub" Version="7.0.7-servicing.23274.5">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
<Sha>24923547018835429e8d08a35b6d1e9eec97b735</Sha>
<Sha>512eac4b458953da405f51ec0ae7766bcb7b32e5</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="7.0.7-servicing.23272.4">
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="7.0.7-servicing.23274.5">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
<Sha>24923547018835429e8d08a35b6d1e9eec97b735</Sha>
<Sha>512eac4b458953da405f51ec0ae7766bcb7b32e5</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.7" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>8e3442dd52923615959c161ce49b9960375ea07b</Sha>
<Sha>5b20af47d99620150c53eaf5db8636fdf730b126</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.7.0" Version="7.0.7-servicing.23269.6" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.7.0" Version="7.0.7-servicing.23274.4" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>8e3442dd52923615959c161ce49b9960375ea07b</Sha>
<Sha>5b20af47d99620150c53eaf5db8636fdf730b126</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="7.0.7" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>8e3442dd52923615959c161ce49b9960375ea07b</Sha>
<Sha>5b20af47d99620150c53eaf5db8636fdf730b126</Sha>
</Dependency>
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="7.0.7-servicing.23272.2" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="7.0.7-servicing.23274.5" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
<Sha>e3bf366a7361267ba472521190d62c9d22f39b14</Sha>
<Sha>b4a5f0c6839363dea534f21736a9d0726c14b41c</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="7.0.7-servicing.23272.4">
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="7.0.7-servicing.23274.5">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
<Sha>24923547018835429e8d08a35b6d1e9eec97b735</Sha>
<Sha>512eac4b458953da405f51ec0ae7766bcb7b32e5</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 @@ -19,8 +19,8 @@
<NETCoreAppMaximumVersion>7.0</NETCoreAppMaximumVersion>
<NETCoreAppFrameworkVersion>7.0</NETCoreAppFrameworkVersion>
<NETCoreAppFramework>net$(NETCoreAppFrameworkVersion)</NETCoreAppFramework>
<MicrosoftDotnetWinFormsProjectTemplatesVersion>7.0.7-servicing.23272.2</MicrosoftDotnetWinFormsProjectTemplatesVersion>
<MicrosoftDotNetWpfProjectTemplatesVersion>7.0.7-servicing.23272.4</MicrosoftDotNetWpfProjectTemplatesVersion>
<MicrosoftDotnetWinFormsProjectTemplatesVersion>7.0.7-servicing.23274.5</MicrosoftDotnetWinFormsProjectTemplatesVersion>
<MicrosoftDotNetWpfProjectTemplatesVersion>7.0.7-servicing.23274.5</MicrosoftDotNetWpfProjectTemplatesVersion>
</PropertyGroup>
<!--Package versions-->
<PropertyGroup>
Expand All @@ -32,12 +32,12 @@
<!-- runtime -->
<MicrosoftNETCoreAppRefVersion>7.0.7</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCoreAppRuntimewinx64Version>7.0.7</MicrosoftNETCoreAppRuntimewinx64Version>
<MicrosoftInternalRuntimeWindowsDesktopTransportVersion>7.0.7-servicing.23269.6</MicrosoftInternalRuntimeWindowsDesktopTransportVersion>
<VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>7.0.7-servicing.23269.6</VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>
<MicrosoftInternalRuntimeWindowsDesktopTransportVersion>7.0.7-servicing.23274.4</MicrosoftInternalRuntimeWindowsDesktopTransportVersion>
<VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>7.0.7-servicing.23274.4</VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>
<!-- winforms -->
<MicrosoftPrivateWinformsVersion>7.0.7-servicing.23272.2</MicrosoftPrivateWinformsVersion>
<MicrosoftPrivateWinformsVersion>7.0.7-servicing.23274.5</MicrosoftPrivateWinformsVersion>
<!-- wpf -->
<MicrosoftDotNetWpfGitHubVersion>7.0.7-servicing.23272.4</MicrosoftDotNetWpfGitHubVersion>
<MicrosoftDotNetWpfGitHubVersion>7.0.7-servicing.23274.5</MicrosoftDotNetWpfGitHubVersion>
<!-- Not auto-updated. -->
<MicrosoftBuildVersion>15.7.179</MicrosoftBuildVersion>
<MicrosoftBuildFrameworkVersion>$(MicrosoftBuildVersion)</MicrosoftBuildFrameworkVersion>
Expand Down

0 comments on commit eacd999

Please sign in to comment.