Skip to content

Commit

Permalink
Merged PR 33415: [internal/release/7.0.4xx] Update dependencies from …
Browse files Browse the repository at this point in the history 
…dnceng/internal/dotnet-windowsdesktop

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.NET.Sdk.WindowsDesktop**: from 7.0.11-servicing.23422.2 to 7.0.11-servicing.23425.6 (parent: Microsoft.WindowsDesktop.App.Ref)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:02937b88-6922-429c-2a20-08db797f5caf)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop
- **Subscription**: 02937b88-6922-429c-2a20-08db797f5caf
- **Build**: 20230825.5
- **Date Produced**: August 25, 2023 8:22:26 PM UTC
- **Commit**: b193aa2e8630cef7ac1d858be3677b0c129e2faf
- **Branch**: refs/heads/internal/release/7.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.WindowsDesktop.App.Ref**: [from 7.0.11 to 7.0.11][1]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 7.0.11 to 7.0.11][1]
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: [from 7.0.11-servicing.23422.3 to 7.0.11-servicing.23425.5][1]
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: [from 7.0.11-servicing.23422.3 to 7.0.11-servicing.23425.5][1]
  - **Microsoft.NET.Sdk.WindowsDesktop**: [from 7.0.11-servicing.23422.2 to 7.0.11-servicing.23425.6][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GC721967ad57&targetVersion=GCb193aa2e86&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-wpf/branches?baseVersion=GCaea83fde38&targetVersion=GC6432861c5a&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:02937b88-6922-429c-2a20-08db797f5caf)
  • Loading branch information
@dotnet-bot @marcpopMSFT
dotnet-bot authored and marcpopMSFT committed Aug 25, 2023
2 parents 17024f4 + e660432 commit 2838d93
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 11 deletions.
4 changes: 2 additions & 2 deletions NuGet.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<!-- Begin: Package sources from dotnet-templating -->
<!-- End: Package sources from dotnet-templating -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-721967a" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-721967ad/nuget/v3/index.json" />
<add key="darc-int-dotnet-windowsdesktop-b193aa2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-b193aa2e/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-windowsdesktop -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
<add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
Expand Down Expand Up @@ -45,7 +45,7 @@
<add key="darc-int-dotnet-runtime-ecb34f8" value="true" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-721967a" value="true" />
<add key="darc-int-dotnet-windowsdesktop-b193aa2" value="true" />
<!-- End: Package sources from dotnet-windowsdesktop -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
</disabledPackageSources>
Expand Down
16 changes: 8 additions & 8 deletions eng/Version.Details.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -157,23 +157,23 @@
</Dependency>
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="7.0.11">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
<Sha>721967ad57b950287505e20f9953ff14b9a10485</Sha>
<Sha>b193aa2e8630cef7ac1d858be3677b0c129e2faf</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0" Version="7.0.11-servicing.23422.3">
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0" Version="7.0.11-servicing.23425.5">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
<Sha>721967ad57b950287505e20f9953ff14b9a10485</Sha>
<Sha>b193aa2e8630cef7ac1d858be3677b0c129e2faf</Sha>
</Dependency>
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="7.0.11">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
<Sha>721967ad57b950287505e20f9953ff14b9a10485</Sha>
<Sha>b193aa2e8630cef7ac1d858be3677b0c129e2faf</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0" Version="7.0.11-servicing.23422.3">
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0" Version="7.0.11-servicing.23425.5">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
<Sha>721967ad57b950287505e20f9953ff14b9a10485</Sha>
<Sha>b193aa2e8630cef7ac1d858be3677b0c129e2faf</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="7.0.11-servicing.23422.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref">
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="7.0.11-servicing.23425.6" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
<Sha>aea83fde388f1f90c7068116c2653b12e31bac40</Sha>
<Sha>6432861c5a360348a9e1a6cc76cced7bd25ab3f9</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="7.0.11">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
Expand Down
2 changes: 1 addition & 1 deletion eng/Versions.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/wpf -->
<MicrosoftNETSdkWindowsDesktopPackageVersion>7.0.11-servicing.23422.2</MicrosoftNETSdkWindowsDesktopPackageVersion>
<MicrosoftNETSdkWindowsDesktopPackageVersion>7.0.11-servicing.23425.6</MicrosoftNETSdkWindowsDesktopPackageVersion>
</PropertyGroup>
<PropertyGroup Label="Manually updated">
<!-- Dependencies from https://github.com/microsoft/MSBuildLocator -->
Expand Down

0 comments on commit 2838d93

Please # to comment.