Skip to content

Commit

Permalink
Merged PR 33401: [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.11-servicing.23422.3 to 7.0.11-servicing.23425.2 (parent: Microsoft.DotNet.Wpf.GitHub)
  - **Microsoft.Internal.Runtime.WindowsDesktop.Transport**: from 7.0.11-servicing.23418.12 to 7.0.11-servicing.23424.27 (parent: Microsoft.Private.Winforms)
  - **Microsoft.Private.Winforms**: from 7.0.11-servicing.23422.3 to 7.0.11-servicing.23425.2 (parent: Microsoft.DotNet.Wpf.GitHub)
  - **Microsoft.NETCore.App.Ref**: from 7.0.11 to 7.0.11 (parent: Microsoft.Private.Winforms)
  - **Microsoft.Private.Winforms**: from 7.0.11-servicing.23422.3 to 7.0.11-servicing.23425.2 (parent: Microsoft.DotNet.Wpf.GitHub)
  - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: from 7.0.11-servicing.23418.12 to 7.0.11-servicing.23424.27 (parent: Microsoft.Private.Winforms)
  - **Microsoft.Private.Winforms**: from 7.0.11-servicing.23422.3 to 7.0.11-servicing.23425.2 (parent: Microsoft.DotNet.Wpf.GitHub)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 7.0.11 to 7.0.11 (parent: Microsoft.Private.Winforms)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 7.0.11-servicing.23422.3 to 7.0.11-servicing.23425.2 (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**: 20230825.6
- **Date Produced**: August 25, 2023 4:55:22 PM UTC
- **Commit**: 6432861c5a360348a9e1a6cc76cced7bd25ab3f9
- **Branch**: refs/heads/internal/release/7.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Wpf.GitHub**: [from 7.0.11-servicing.23422.2 to 7.0.11-servicing.23425.6][1]
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 7.0.11-servicing.23422.2 to 7.0.11-servicing.23425.6][1]
  - **Microsoft.NET.Sdk.WindowsDesktop**: [from 7.0.11-servicing.23422.2 to 7.0.11-servicing.23425.6][1]
  - **Microsoft.Private.Winforms**: [from 7.0.11-servicing.23422.3 to 7.0.11-servicing.23425.2][2]
  - **Microsoft.Internal.Runtime.WindowsDesktop.Transport**: [from 7.0.11-servicing.23418.12 to 7.0.11-servicing.23424.27][3]
  - **Microsoft.Private.Winforms**: [from 7.0.11-servicing.23422.3 to 7.0.11-servicing.23425.2][2]
  - **Microsoft.NETCore.App.Ref**: [from 7.0.11 to 7.0.11][3]
  - **Microsoft.Private.Winforms**: [from 7.0.11-servicing.23422.3 to 7.0.11-servicing.23425.2][2]
...
  • Loading branch information
dotnet-bot authored and marcpopMSFT committed Aug 25, 2023
2 parents 721967a + db709a1 commit b193aa2
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-41b7214" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-41b7214a/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-ecb34f8" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-ecb34f85/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-41b7214" value="true" />
<add key="darc-int-dotnet-runtime-ecb34f8" 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.11-servicing.23418.12" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="Microsoft.Internal.Runtime.WindowsDesktop.Transport" Version="7.0.11-servicing.23424.27" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>41b7214ace077c230589720cf3460073d1bbd948</Sha>
<Sha>ecb34f85ec92e1b3c814edf7da83337e199e7f66</Sha>
</Dependency>
<Dependency Name="Microsoft.Private.Winforms" Version="7.0.11-servicing.23422.3" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
<Dependency Name="Microsoft.Private.Winforms" Version="7.0.11-servicing.23425.2" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
<Sha>81760b1e789d848e1c44733615cf2939159603a3</Sha>
<Sha>66db733312de7bd21ed3e73cee0b27fb75d91b70</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Wpf.GitHub" Version="7.0.11-servicing.23422.2">
<Dependency Name="Microsoft.DotNet.Wpf.GitHub" Version="7.0.11-servicing.23425.6">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
<Sha>aea83fde388f1f90c7068116c2653b12e31bac40</Sha>
<Sha>6432861c5a360348a9e1a6cc76cced7bd25ab3f9</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="7.0.11-servicing.23422.2">
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="7.0.11-servicing.23425.6">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
<Sha>aea83fde388f1f90c7068116c2653b12e31bac40</Sha>
<Sha>6432861c5a360348a9e1a6cc76cced7bd25ab3f9</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.11" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>41b7214ace077c230589720cf3460073d1bbd948</Sha>
<Sha>ecb34f85ec92e1b3c814edf7da83337e199e7f66</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.7.0" Version="7.0.11-servicing.23418.12" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.7.0" Version="7.0.11-servicing.23424.27" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>41b7214ace077c230589720cf3460073d1bbd948</Sha>
<Sha>ecb34f85ec92e1b3c814edf7da83337e199e7f66</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="7.0.11" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>41b7214ace077c230589720cf3460073d1bbd948</Sha>
<Sha>ecb34f85ec92e1b3c814edf7da83337e199e7f66</Sha>
</Dependency>
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="7.0.11-servicing.23422.3" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="7.0.11-servicing.23425.2" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
<Sha>81760b1e789d848e1c44733615cf2939159603a3</Sha>
<Sha>66db733312de7bd21ed3e73cee0b27fb75d91b70</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="7.0.11-servicing.23422.2">
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="7.0.11-servicing.23425.6">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
<Sha>aea83fde388f1f90c7068116c2653b12e31bac40</Sha>
<Sha>6432861c5a360348a9e1a6cc76cced7bd25ab3f9</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.11-servicing.23422.3</MicrosoftDotnetWinFormsProjectTemplatesVersion>
<MicrosoftDotNetWpfProjectTemplatesVersion>7.0.11-servicing.23422.2</MicrosoftDotNetWpfProjectTemplatesVersion>
<MicrosoftDotnetWinFormsProjectTemplatesVersion>7.0.11-servicing.23425.2</MicrosoftDotnetWinFormsProjectTemplatesVersion>
<MicrosoftDotNetWpfProjectTemplatesVersion>7.0.11-servicing.23425.6</MicrosoftDotNetWpfProjectTemplatesVersion>
</PropertyGroup>
<!--Package versions-->
<PropertyGroup>
Expand All @@ -32,12 +32,12 @@
<!-- runtime -->
<MicrosoftNETCoreAppRefVersion>7.0.11</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCoreAppRuntimewinx64Version>7.0.11</MicrosoftNETCoreAppRuntimewinx64Version>
<MicrosoftInternalRuntimeWindowsDesktopTransportVersion>7.0.11-servicing.23418.12</MicrosoftInternalRuntimeWindowsDesktopTransportVersion>
<VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>7.0.11-servicing.23418.12</VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>
<MicrosoftInternalRuntimeWindowsDesktopTransportVersion>7.0.11-servicing.23424.27</MicrosoftInternalRuntimeWindowsDesktopTransportVersion>
<VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>7.0.11-servicing.23424.27</VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>
<!-- winforms -->
<MicrosoftPrivateWinformsVersion>7.0.11-servicing.23422.3</MicrosoftPrivateWinformsVersion>
<MicrosoftPrivateWinformsVersion>7.0.11-servicing.23425.2</MicrosoftPrivateWinformsVersion>
<!-- wpf -->
<MicrosoftDotNetWpfGitHubVersion>7.0.11-servicing.23422.2</MicrosoftDotNetWpfGitHubVersion>
<MicrosoftDotNetWpfGitHubVersion>7.0.11-servicing.23425.6</MicrosoftDotNetWpfGitHubVersion>
<!-- Not auto-updated. -->
<MicrosoftBuildVersion>15.7.179</MicrosoftBuildVersion>
<MicrosoftBuildFrameworkVersion>$(MicrosoftBuildVersion)</MicrosoftBuildFrameworkVersion>
Expand Down

0 comments on commit b193aa2

Please sign in to comment.