Skip to content

Commit

Permalink
Merged PR 31547: [internal/release/7.0.3xx] 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.7-servicing.23272.4 to 7.0.7-servicing.23274.5 (parent: Microsoft.WindowsDesktop.App.Ref)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:589f34b6-1fbf-455f-b175-08db3b93de76)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop
- **Subscription**: 589f34b6-1fbf-455f-b175-08db3b93de76
- **Build**: 20230525.3
- **Date Produced**: May 25, 2023 2:32:27 PM UTC
- **Commit**: eacd999cfa912fdb8ff68aa20fb8f3f8eb1c6170
- **Branch**: refs/heads/internal/release/7.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.WindowsDesktop.App.Ref**: [from 7.0.7 to 7.0.7][1]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 7.0.7 to 7.0.7][1]
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: [from 7.0.7-servicing.23272.4 to 7.0.7-servicing.23275.3][1]
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: [from 7.0.7-servicing.23272.4 to 7.0.7-servicing.23275.3][1]
  - **Microsoft.NET.Sdk.WindowsDesktop**: [from 7.0.7-servicing.23272.4 to 7.0.7-servicing.23274.5][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GC2f39602907&targetVersion=GCeacd999cfa&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-wpf/branches?baseVersion=GC2492354701&targetVersion=GC512eac4b45&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:589f34b6-1fbf-455f-b175-08db3b93de76)
  • Loading branch information
@dotnet-bot @mmitche
dotnet-bot authored and mmitche committed May 25, 2023
1 parent 6cdde44 commit 9abb6bd
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 15 deletions.
8 changes: 2 additions & 6 deletions NuGet.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,7 @@
<add key="darc-pub-dotnet-templating-98cb24f-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-98cb24f4-1/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-templating -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-2f39602" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-2f396029/nuget/v3/index.json" />
<add key="darc-int-dotnet-windowsdesktop-2f39602-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-2f396029-2/nuget/v3/index.json" />
<add key="darc-int-dotnet-windowsdesktop-2f39602-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-2f396029-1/nuget/v3/index.json" />
<add key="darc-int-dotnet-windowsdesktop-eacd999" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-eacd999c/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 @@ -49,9 +47,7 @@
<add key="darc-int-dotnet-runtime-5b20af4" value="true" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-2f39602-1" value="true" />
<add key="darc-int-dotnet-windowsdesktop-2f39602-2" value="true" />
<add key="darc-int-dotnet-windowsdesktop-2f39602" value="true" />
<add key="darc-int-dotnet-windowsdesktop-eacd999" 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.7">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
<Sha>2f39602907080719788f297c6393a1a24c10403b</Sha>
<Sha>eacd999cfa912fdb8ff68aa20fb8f3f8eb1c6170</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0" Version="7.0.7-servicing.23272.4">
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0" Version="7.0.7-servicing.23275.3">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
<Sha>2f39602907080719788f297c6393a1a24c10403b</Sha>
<Sha>eacd999cfa912fdb8ff68aa20fb8f3f8eb1c6170</Sha>
</Dependency>
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="7.0.7">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
<Sha>2f39602907080719788f297c6393a1a24c10403b</Sha>
<Sha>eacd999cfa912fdb8ff68aa20fb8f3f8eb1c6170</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0" Version="7.0.7-servicing.23272.4">
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0" Version="7.0.7-servicing.23275.3">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
<Sha>2f39602907080719788f297c6393a1a24c10403b</Sha>
<Sha>eacd999cfa912fdb8ff68aa20fb8f3f8eb1c6170</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="7.0.7-servicing.23272.4" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref">
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="7.0.7-servicing.23274.5" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
<Sha>24923547018835429e8d08a35b6d1e9eec97b735</Sha>
<Sha>512eac4b458953da405f51ec0ae7766bcb7b32e5</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="7.0.7">
<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 @@ -169,7 +169,7 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/wpf -->
<MicrosoftNETSdkWindowsDesktopPackageVersion>7.0.7-servicing.23272.4</MicrosoftNETSdkWindowsDesktopPackageVersion>
<MicrosoftNETSdkWindowsDesktopPackageVersion>7.0.7-servicing.23274.5</MicrosoftNETSdkWindowsDesktopPackageVersion>
</PropertyGroup>
<PropertyGroup Label="Manually updated">
<!-- Dependencies from https://github.com/microsoft/MSBuildLocator -->
Expand Down

0 comments on commit 9abb6bd

Please sign in to comment.