Skip to content

Commit

Permalink
Merged PR 44480: [internal/release/9.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 9.0.0-rtm.24523.2 to 9.0.0-rtm.24529.2 (parent: Microsoft.WindowsDesktop.App.Ref)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 9.0.0-rtm.24523.2 to 9.0.0-rtm.24529.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 9.0.0-rtm.24523.2 to 9.0.0-rtm.24529.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:87db4525-6885-42da-8dd0-7ce296d7fd1a)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop
- **Subscription**: 87db4525-6885-42da-8dd0-7ce296d7fd1a
- **Build**: 20241029.2
- **Date Produced**: October 29, 2024 1:26:07 PM UTC
- **Commit**: 308dc7955704be60afc72ec00902cc18e028c3c2
- **Branch**: refs/heads/internal/release/9.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.WindowsDesktop.App.Ref**: [from 9.0.0 to 9.0.0][1]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 9.0.0 to 9.0.0][1]
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0**: [from 9.0.0-rtm.24523.5 to 9.0.0-rtm.24529.2][1]
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0**: [from 9.0.0-rtm.24523.5 to 9.0.0-rtm.24529.2][1]
  - **Microsoft.NET.Sdk.WindowsDesktop**: [from 9.0.0-rtm.24523.2 to 9.0.0-rtm.24529.2][2]
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 9.0.0-rtm.24523.2 to 9.0.0-rtm.24529.1][3]
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 9.0.0-rtm.24523.2 to 9.0.0-rtm.24529.2][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GC2e5178f9d725c4becd3f04f9627f9e45d7469f03&targetVersion=GC308dc7955704be60afc72ec00902cc18e028c3c2&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-wpf/branches?baseVersion=GCc23c8e8b764b527c6bf96b8f38379faae3c4dc1d&targetVersion=GCa04736acb8edb533756131d3d5fc55f15cd03d6a&_a=files
[3]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GCbcf70f48f3ad07c7747c64601348e1df81f1f19e&targetVersion=GC62ebdb4b0d5cc7e163b8dc9331dc196e576bf162&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:87db4525-6885-42da-8dd0-7ce296d7fd1a)
  • Loading branch information
@wtgodbe
maestro-prod-Primary authored and wtgodbe committed Oct 29, 2024
1 parent b1e7cb6 commit 9f2317a
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 25 deletions.
10 changes: 2 additions & 8 deletions NuGet.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,7 @@
<add key="darc-pub-dotnet-templating-e07a90b-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-e07a90b4-1/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-templating -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-2e5178f" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-2e5178f9/nuget/v3/index.json" />
<add key="darc-int-dotnet-windowsdesktop-2e5178f-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-2e5178f9-3/nuget/v3/index.json" />
<add key="darc-int-dotnet-windowsdesktop-2e5178f-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-2e5178f9-2/nuget/v3/index.json" />
<add key="darc-int-dotnet-windowsdesktop-2e5178f-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-2e5178f9-1/nuget/v3/index.json" />
<add key="darc-int-dotnet-windowsdesktop-308dc79" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-308dc795/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 @@ -68,10 +65,7 @@
<add key="darc-int-dotnet-runtime-9d5a6a9" value="true" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-2e5178f-1" value="true" />
<add key="darc-int-dotnet-windowsdesktop-2e5178f-2" value="true" />
<add key="darc-int-dotnet-windowsdesktop-2e5178f-3" value="true" />
<add key="darc-int-dotnet-windowsdesktop-2e5178f" value="true" />
<add key="darc-int-dotnet-windowsdesktop-308dc79" 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
24 changes: 12 additions & 12 deletions eng/Version.Details.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -256,24 +256,24 @@
</Dependency>
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="9.0.0">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
<Sha>2e5178f9d725c4becd3f04f9627f9e45d7469f03</Sha>
<Sha>308dc7955704be60afc72ec00902cc18e028c3c2</Sha>
<SourceBuildTarball RepoName="windowsdesktop" ManagedOnly="true" />
</Dependency>
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0" Version="9.0.0-rtm.24523.5">
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0" Version="9.0.0-rtm.24529.2">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
<Sha>2e5178f9d725c4becd3f04f9627f9e45d7469f03</Sha>
<Sha>308dc7955704be60afc72ec00902cc18e028c3c2</Sha>
</Dependency>
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="9.0.0">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
<Sha>2e5178f9d725c4becd3f04f9627f9e45d7469f03</Sha>
<Sha>308dc7955704be60afc72ec00902cc18e028c3c2</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0" Version="9.0.0-rtm.24523.5">
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0" Version="9.0.0-rtm.24529.2">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
<Sha>2e5178f9d725c4becd3f04f9627f9e45d7469f03</Sha>
<Sha>308dc7955704be60afc72ec00902cc18e028c3c2</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="9.0.0-rtm.24523.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref">
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="9.0.0-rtm.24529.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
<Sha>c23c8e8b764b527c6bf96b8f38379faae3c4dc1d</Sha>
<Sha>a04736acb8edb533756131d3d5fc55f15cd03d6a</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="9.0.0">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
Expand Down Expand Up @@ -390,13 +390,13 @@
<SourceBuild RepoName="test-templates" ManagedOnly="true" />
</Dependency>
<!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop -->
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="9.0.0-rtm.24523.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="9.0.0-rtm.24529.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
<Sha>bcf70f48f3ad07c7747c64601348e1df81f1f19e</Sha>
<Sha>62ebdb4b0d5cc7e163b8dc9331dc196e576bf162</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="9.0.0-rtm.24523.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="9.0.0-rtm.24529.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
<Sha>c23c8e8b764b527c6bf96b8f38379faae3c4dc1d</Sha>
<Sha>a04736acb8edb533756131d3d5fc55f15cd03d6a</Sha>
</Dependency>
<Dependency Name="Microsoft.Web.Xdt" Version="9.0.0-preview.24522.2">
<Uri>https://github.com/dotnet/xdt</Uri>
Expand Down
10 changes: 5 additions & 5 deletions eng/Versions.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/winforms -->
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>9.0.0-rtm.24523.2</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>9.0.0-rtm.24529.1</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/test-templates -->
Expand Down Expand Up @@ -146,8 +146,8 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
<VSRedistCommonWindowsDesktopSharedFrameworkx6490PackageVersion>9.0.0-rtm.24523.5</VSRedistCommonWindowsDesktopSharedFrameworkx6490PackageVersion>
<VSRedistCommonWindowsDesktopTargetingPackx6490PackageVersion>9.0.0-rtm.24523.5</VSRedistCommonWindowsDesktopTargetingPackx6490PackageVersion>
<VSRedistCommonWindowsDesktopSharedFrameworkx6490PackageVersion>9.0.0-rtm.24529.2</VSRedistCommonWindowsDesktopSharedFrameworkx6490PackageVersion>
<VSRedistCommonWindowsDesktopTargetingPackx6490PackageVersion>9.0.0-rtm.24529.2</VSRedistCommonWindowsDesktopTargetingPackx6490PackageVersion>
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>9.0.0</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
<MicrosoftWindowsDesktopAppRefPackageVersion>9.0.0</MicrosoftWindowsDesktopAppRefPackageVersion>
</PropertyGroup>
Expand Down Expand Up @@ -253,8 +253,8 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/wpf -->
<MicrosoftNETSdkWindowsDesktopPackageVersion>9.0.0-rtm.24523.2</MicrosoftNETSdkWindowsDesktopPackageVersion>
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>9.0.0-rtm.24523.2</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
<MicrosoftNETSdkWindowsDesktopPackageVersion>9.0.0-rtm.24529.2</MicrosoftNETSdkWindowsDesktopPackageVersion>
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>9.0.0-rtm.24529.2</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
</PropertyGroup>
<PropertyGroup Label="Runtime and Apphost aliases">
<!-- Runtime and Apphost pack versions are the same for all RIDs. We flow the x64 version above and create aliases without the winx64 here for clarity elsewhere. -->
Expand Down

0 comments on commit 9f2317a

Please sign in to comment.