Skip to content

Commit

Permalink
Merged PR 32704: [internal/release/7.0.1xx] 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.10-servicing.23364.1 to 7.0.10-servicing.23364.4 (parent: Microsoft.WindowsDesktop.App.Ref)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:fcff5d67-4caf-41c6-139b-08da7ef5fa55)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop
- **Subscription**: fcff5d67-4caf-41c6-139b-08da7ef5fa55
- **Build**: 20230717.2
- **Date Produced**: July 17, 2023 7:03:41 PM UTC
- **Commit**: 996ed6b07099f377a6b05581860a1f66a30aca00
- **Branch**: refs/heads/internal/release/7.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.WindowsDesktop.App.Ref**: [from 7.0.10 to 7.0.10][1]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 7.0.10 to 7.0.10][1]
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: [from 7.0.10-servicing.23364.4 to 7.0.10-servicing.23367.2][1]
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: [from 7.0.10-servicing.23364.4 to 7.0.10-servicing.23367.2][1]
  - **Microsoft.NET.Sdk.WindowsDesktop**: [from 7.0.10-servicing.23364.1 to 7.0.10-servicing.23364.4][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GCf3874631f8&targetVersion=GC996ed6b070&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-wpf/branches?baseVersion=GC5461ffc0ad&targetVersion=GC9a9892f520&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:fcff5d67-4caf-41c6-139b-08da7ef5fa55)
  • Loading branch information
@dotnet-bot @vseanreesermsft
dotnet-bot authored and vseanreesermsft committed Jul 17, 2023
2 parents 5894fb6 + 054cb8e commit 82f22c4
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-int-dotnet-templating-420b5a6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-420b5a6d/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-templating -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-f387463" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-f3874631/nuget/v3/index.json" />
<add key="darc-int-dotnet-windowsdesktop-996ed6b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-996ed6b0/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 @@ -47,7 +47,7 @@
<add key="darc-int-dotnet-runtime-a6dbb80" value="true" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-f387463" value="true" />
<add key="darc-int-dotnet-windowsdesktop-996ed6b" 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.10">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
<Sha>f3874631f8761a385650af9a44d3254f8839e6e9</Sha>
<Sha>996ed6b07099f377a6b05581860a1f66a30aca00</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0" Version="7.0.10-servicing.23364.4">
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0" Version="7.0.10-servicing.23367.2">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
<Sha>f3874631f8761a385650af9a44d3254f8839e6e9</Sha>
<Sha>996ed6b07099f377a6b05581860a1f66a30aca00</Sha>
</Dependency>
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="7.0.10">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
<Sha>f3874631f8761a385650af9a44d3254f8839e6e9</Sha>
<Sha>996ed6b07099f377a6b05581860a1f66a30aca00</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0" Version="7.0.10-servicing.23364.4">
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0" Version="7.0.10-servicing.23367.2">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
<Sha>f3874631f8761a385650af9a44d3254f8839e6e9</Sha>
<Sha>996ed6b07099f377a6b05581860a1f66a30aca00</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="7.0.10-servicing.23364.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref">
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="7.0.10-servicing.23364.4" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
<Sha>5461ffc0ad318e6e60746a1440c67866d74b507e</Sha>
<Sha>9a9892f5204f1a1b31ab2c81b025d6e35e0f3693</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="7.0.10">
<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 @@ -168,7 +168,7 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/wpf -->
<MicrosoftNETSdkWindowsDesktopPackageVersion>7.0.10-servicing.23364.1</MicrosoftNETSdkWindowsDesktopPackageVersion>
<MicrosoftNETSdkWindowsDesktopPackageVersion>7.0.10-servicing.23364.4</MicrosoftNETSdkWindowsDesktopPackageVersion>
</PropertyGroup>
<PropertyGroup Label="Manually updated">
<!-- Dependencies from https://github.com/microsoft/MSBuildLocator -->
Expand Down

0 comments on commit 82f22c4

Please sign in to comment.