Skip to content

Commit

Permalink
Merged PR 38385: [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.18-servicing.24168.10 to 7.0.18-servicing.24169.14 (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**:
- **Date Produced**: March 20, 2024 7:36:29 PM UTC
- **Commit**: af494c5c30f33cdb12a68420c4d4a7d791b21ed0
- **Branch**: refs/heads/internal/release/7.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.WindowsDesktop.App.Ref**: [from 7.0.18 to 7.0.18][1]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 7.0.18 to 7.0.18][1]
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: [from 7.0.18-servicing.24169.11 to 7.0.18-servicing.24170.3][1]
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: [from 7.0.18-servicing.24169.11 to 7.0.18-servicing.24170.3][1]
  - **Microsoft.NET.Sdk.WindowsDesktop**: [from 7.0.18-servicing.24168.10 to 7.0.18-servicing.24169.14][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GC769e1471d5b304a50d0dbaa45d9be58c5764d140&targetVersion=GCaf494c5c30f33cdb12a68420c4d4a7d791b21ed0&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-wpf/branches?baseVersion=GC4ee6b308b4cc05cf92d7552cb00f52041a1e4793&targetVersion=GC71273b560061b69cef763838282ef085e53a73cb&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:02937b88-6922-429c-2a20-08db797f5caf)
  • Loading branch information
@dotnet-bot @vseanreesermsft
dotnet-bot authored and vseanreesermsft committed Mar 20, 2024
2 parents f7fb0a3 + e503e8d commit 211ad1a
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 @@ -18,7 +18,7 @@
<add key="darc-pub-dotnet-templating-afb365f" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-afb365fb/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-templating -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-769e147" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-769e1471/nuget/v3/index.json" />
<add key="darc-int-dotnet-windowsdesktop-af494c5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-af494c5c/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 @@ -46,7 +46,7 @@
<add key="darc-int-dotnet-runtime-544c7e6" value="true" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-769e147" value="true" />
<add key="darc-int-dotnet-windowsdesktop-af494c5" 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.18">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
<Sha>769e1471d5b304a50d0dbaa45d9be58c5764d140</Sha>
<Sha>af494c5c30f33cdb12a68420c4d4a7d791b21ed0</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0" Version="7.0.18-servicing.24169.11">
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0" Version="7.0.18-servicing.24170.3">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
<Sha>769e1471d5b304a50d0dbaa45d9be58c5764d140</Sha>
<Sha>af494c5c30f33cdb12a68420c4d4a7d791b21ed0</Sha>
</Dependency>
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="7.0.18">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
<Sha>769e1471d5b304a50d0dbaa45d9be58c5764d140</Sha>
<Sha>af494c5c30f33cdb12a68420c4d4a7d791b21ed0</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0" Version="7.0.18-servicing.24169.11">
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0" Version="7.0.18-servicing.24170.3">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
<Sha>769e1471d5b304a50d0dbaa45d9be58c5764d140</Sha>
<Sha>af494c5c30f33cdb12a68420c4d4a7d791b21ed0</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="7.0.18-servicing.24168.10" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref">
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="7.0.18-servicing.24169.14" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
<Sha>4ee6b308b4cc05cf92d7552cb00f52041a1e4793</Sha>
<Sha>71273b560061b69cef763838282ef085e53a73cb</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="7.0.18">
<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.18-servicing.24168.10</MicrosoftNETSdkWindowsDesktopPackageVersion>
<MicrosoftNETSdkWindowsDesktopPackageVersion>7.0.18-servicing.24169.14</MicrosoftNETSdkWindowsDesktopPackageVersion>
</PropertyGroup>
<PropertyGroup Label="Manually updated">
<!-- Dependencies from https://github.com/microsoft/MSBuildLocator -->
Expand Down

0 comments on commit 211ad1a

Please sign in to comment.