Skip to content

Commit

Permalink
Merged PR 28259: [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.2-servicing.22601.4 to 7.0.2-servicing.22606.2 (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**: 20221207.1
- **Date Produced**: December 7, 2022 10:21:27 AM UTC
- **Commit**: f51697b054c6691ed59209ef8524013d44bb449c
- **Branch**: refs/heads/internal/release/7.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.WindowsDesktop.App.Ref**: [from 7.0.2 to 7.0.2][1]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 7.0.2 to 7.0.2][1]
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: [from 7.0.2-servicing.22601.5 to 7.0.2-servicing.22607.1][1]
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: [from 7.0.2-servicing.22601.5 to 7.0.2-servicing.22607.1][1]
  - **Microsoft.NET.Sdk.WindowsDesktop**: [from 7.0.2-servicing.22601.4 to 7.0.2-servicing.22606.2][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GC44aec6b&targetVersion=GCf51697b&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-wpf/branches?baseVersion=GC7d3c040&targetVersion=GCdf04c57&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:fcff5d67-4caf-41c6-139b-08da7ef5fa55)
  • Loading branch information
@dotnet-bot @dkurepa
dotnet-bot authored and dkurepa committed Dec 7, 2022
1 parent 51a3713 commit 9872069
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 13 deletions.
6 changes: 2 additions & 4 deletions NuGet.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@
<add key="darc-int-dotnet-templating-0a0686f" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-0a0686fa/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-templating -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-44aec6b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-44aec6b7/nuget/v3/index.json" />
<add key="darc-int-dotnet-windowsdesktop-44aec6b-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-44aec6b7-1/nuget/v3/index.json" />
<add key="darc-int-dotnet-windowsdesktop-f51697b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-f51697b0/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 @@ -48,8 +47,7 @@
<add key="darc-int-dotnet-runtime-d037e07" value="true" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-44aec6b-1" value="true" />
<add key="darc-int-dotnet-windowsdesktop-44aec6b" value="true" />
<add key="darc-int-dotnet-windowsdesktop-f51697b" 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.2">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
<Sha>44aec6b7b3cb8f9da36688105159af845cd85f20</Sha>
<Sha>f51697b054c6691ed59209ef8524013d44bb449c</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0" Version="7.0.2-servicing.22601.5">
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0" Version="7.0.2-servicing.22607.1">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
<Sha>44aec6b7b3cb8f9da36688105159af845cd85f20</Sha>
<Sha>f51697b054c6691ed59209ef8524013d44bb449c</Sha>
</Dependency>
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="7.0.2">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
<Sha>44aec6b7b3cb8f9da36688105159af845cd85f20</Sha>
<Sha>f51697b054c6691ed59209ef8524013d44bb449c</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0" Version="7.0.2-servicing.22601.5">
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0" Version="7.0.2-servicing.22607.1">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
<Sha>44aec6b7b3cb8f9da36688105159af845cd85f20</Sha>
<Sha>f51697b054c6691ed59209ef8524013d44bb449c</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="7.0.2-servicing.22601.4" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref">
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="7.0.2-servicing.22606.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
<Sha>7d3c040a09d0a9a7434c291e353df73b7bb0ef37</Sha>
<Sha>df04c57b2e2bb986f0afc2384cbebb3c950447b5</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="7.0.2">
<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.2-servicing.22601.4</MicrosoftNETSdkWindowsDesktopPackageVersion>
<MicrosoftNETSdkWindowsDesktopPackageVersion>7.0.2-servicing.22606.2</MicrosoftNETSdkWindowsDesktopPackageVersion>
</PropertyGroup>
<PropertyGroup Label="Manually updated">
<!-- Dependencies from https://github.com/microsoft/MSBuildLocator -->
Expand Down

0 comments on commit 9872069

Please sign in to comment.