Skip to content

Commit

Permalink
Merged PR 34984: [internal/release/8.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 8.0.0-rtm.23531.2 to 8.0.0-rtm.23531.4 (parent: Microsoft.WindowsDesktop.App.Ref)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:43ca46dd-3142-499e-f076-08dbd5a5cbe7)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop
- **Subscription**: 43ca46dd-3142-499e-f076-08dbd5a5cbe7
- **Build**: 20231101.1
- **Date Produced**: November 1, 2023 10:02:03 AM UTC
- **Commit**: c0170915ed6c164a594cd9d558d44aaf98fc6961
- **Branch**: refs/heads/internal/release/8.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.WindowsDesktop.App.Ref**: [from 8.0.0 to 8.0.0][1]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 8.0.0 to 8.0.0][1]
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0**: [from 8.0.0-rtm.23531.3 to 8.0.0-rtm.23551.1][1]
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0**: [from 8.0.0-rtm.23531.3 to 8.0.0-rtm.23551.1][1]
  - **Microsoft.NET.Sdk.WindowsDesktop**: [from 8.0.0-rtm.23531.2 to 8.0.0-rtm.23531.4][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GCa153f4ef85&targetVersion=GCc0170915ed&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-wpf/branches?baseVersion=GCa713d39da1&targetVersion=GC239f8da8fb&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:43ca46dd-3142-499e-f076-08dbd5a5cbe7)
  • Loading branch information
dotnet-bot authored and dkurepa committed Nov 1, 2023
1 parent 3e931e8 commit e9d13cb
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 11 deletions.
4 changes: 2 additions & 2 deletions NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<add key="darc-int-dotnet-templating-4085146" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-40851465/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-templating -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-a153f4e" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-a153f4ef/nuget/v3/index.json" />
<add key="darc-int-dotnet-windowsdesktop-c017091" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-c0170915/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 @@ -60,7 +60,7 @@
<add key="darc-int-dotnet-runtime-5535e31" value="true" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-a153f4e" value="true" />
<add key="darc-int-dotnet-windowsdesktop-c017091" 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
Original file line number Diff line number Diff line change
Expand Up @@ -218,23 +218,23 @@
</Dependency>
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="8.0.0">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
<Sha>a153f4ef85bc898976dd3adcd10d7a97a61e296a</Sha>
<Sha>c0170915ed6c164a594cd9d558d44aaf98fc6961</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0" Version="8.0.0-rtm.23531.3">
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0" Version="8.0.0-rtm.23551.1">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
<Sha>a153f4ef85bc898976dd3adcd10d7a97a61e296a</Sha>
<Sha>c0170915ed6c164a594cd9d558d44aaf98fc6961</Sha>
</Dependency>
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="8.0.0">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
<Sha>a153f4ef85bc898976dd3adcd10d7a97a61e296a</Sha>
<Sha>c0170915ed6c164a594cd9d558d44aaf98fc6961</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0" Version="8.0.0-rtm.23531.3">
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0" Version="8.0.0-rtm.23551.1">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
<Sha>a153f4ef85bc898976dd3adcd10d7a97a61e296a</Sha>
<Sha>c0170915ed6c164a594cd9d558d44aaf98fc6961</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="8.0.0-rtm.23531.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref">
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="8.0.0-rtm.23531.4" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
<Sha>a713d39da10c1a548c70e9024c180f0c1785f881</Sha>
<Sha>239f8da8fbf8cf2a6cd0c793f0d02679bf4ccf6a</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="8.0.0">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
Expand Down
2 changes: 1 addition & 1 deletion eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/wpf -->
<MicrosoftNETSdkWindowsDesktopPackageVersion>8.0.0-rtm.23531.2</MicrosoftNETSdkWindowsDesktopPackageVersion>
<MicrosoftNETSdkWindowsDesktopPackageVersion>8.0.0-rtm.23531.4</MicrosoftNETSdkWindowsDesktopPackageVersion>
</PropertyGroup>
<PropertyGroup Label="Manually updated">
<!-- Dependencies from https://github.com/microsoft/MSBuildLocator -->
Expand Down

0 comments on commit e9d13cb

Please sign in to comment.