Skip to content

Commit

Permalink
Merged PR 45866: [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.1-rtm.24604.3 to 9.0.1-rtm.24610.3 (parent: Microsoft.WindowsDesktop.App.Ref)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 9.0.1-servicing.24604.3 to 9.0.1-servicing.24610.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 9.0.1-rtm.24604.3 to 9.0.1-rtm.24610.3 (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**: 20241210.4
- **Date Produced**: December 11, 2024 5:46:44 AM UTC
- **Commit**: af254ce17dd6827439a1e51006ddf804a0093a13
- **Branch**: refs/heads/internal/release/9.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.WindowsDesktop.App.Ref**: [from 9.0.1 to 9.0.1][1]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 9.0.1 to 9.0.1][1]
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0**: [from 9.0.1-servicing.24604.4 to 9.0.1-servicing.24610.4][1]
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0**: [from 9.0.1-servicing.24604.4 to 9.0.1-servicing.24610.4][1]
  - **Microsoft.NET.Sdk.WindowsDesktop**: [from 9.0.1-rtm.24604.3 to 9.0.1-rtm.24610.3][2]
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 9.0.1-servicing.24604.3 to 9.0.1-servicing.24610.6][3]
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 9.0.1-rtm.24604.3 to 9.0.1-rtm.24610.3][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GC1db7b9dd6405faab770fe63d6fe0acbce686ffa9&targetVersion=GCaf254ce17dd6827439a1e51006ddf804a0093a13&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-wpf/branches?baseVersion=GCaaef42794203f462cc23c0ffab4086108938182e&targetVersion=GCf26d48cd826cfd41bed05708d1cdc9e219bf8514&_a=files
[3]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GCa0809427d515428bce23e14fe9ca6214d19054c4&targetVersion=GC5a82e6f3c764285d3e2c5307e46fd5cbd546c7cd&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:87db4525-6885-42da-8dd0-7ce296d7fd1a)
  • Loading branch information
maestro-prod-Primary authored and marcpopMSFT committed Dec 11, 2024
1 parent e38ff25 commit 02a158e
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 21 deletions.
6 changes: 2 additions & 4 deletions NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,7 @@
<add key="darc-pub-dotnet-templating-b1003b4-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-b1003b44-1/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-templating -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-1db7b9d" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-1db7b9dd/nuget/v3/index.json" />
<add key="darc-int-dotnet-windowsdesktop-1db7b9d-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-1db7b9dd-1/nuget/v3/index.json" />
<add key="darc-int-dotnet-windowsdesktop-af254ce" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-af254ce1/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 @@ -58,8 +57,7 @@
<add key="darc-int-dotnet-runtime-c8acea2" value="true" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-1db7b9d-1" value="true" />
<add key="darc-int-dotnet-windowsdesktop-1db7b9d" value="true" />
<add key="darc-int-dotnet-windowsdesktop-af254ce" 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
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.1">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
<Sha>1db7b9dd6405faab770fe63d6fe0acbce686ffa9</Sha>
<Sha>af254ce17dd6827439a1e51006ddf804a0093a13</Sha>
<SourceBuildTarball RepoName="windowsdesktop" ManagedOnly="true" />
</Dependency>
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0" Version="9.0.1-servicing.24604.4">
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0" Version="9.0.1-servicing.24610.4">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
<Sha>1db7b9dd6405faab770fe63d6fe0acbce686ffa9</Sha>
<Sha>af254ce17dd6827439a1e51006ddf804a0093a13</Sha>
</Dependency>
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="9.0.1">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
<Sha>1db7b9dd6405faab770fe63d6fe0acbce686ffa9</Sha>
<Sha>af254ce17dd6827439a1e51006ddf804a0093a13</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0" Version="9.0.1-servicing.24604.4">
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0" Version="9.0.1-servicing.24610.4">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
<Sha>1db7b9dd6405faab770fe63d6fe0acbce686ffa9</Sha>
<Sha>af254ce17dd6827439a1e51006ddf804a0093a13</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="9.0.1-rtm.24604.3" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref">
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="9.0.1-rtm.24610.3" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
<Sha>aaef42794203f462cc23c0ffab4086108938182e</Sha>
<Sha>f26d48cd826cfd41bed05708d1cdc9e219bf8514</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="9.0.1">
<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.1-servicing.24604.3" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="9.0.1-servicing.24610.6" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
<Sha>a0809427d515428bce23e14fe9ca6214d19054c4</Sha>
<Sha>5a82e6f3c764285d3e2c5307e46fd5cbd546c7cd</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="9.0.1-rtm.24604.3" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="9.0.1-rtm.24610.3" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
<Sha>aaef42794203f462cc23c0ffab4086108938182e</Sha>
<Sha>f26d48cd826cfd41bed05708d1cdc9e219bf8514</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
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from /~https://github.com/dotnet/winforms -->
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>9.0.1-servicing.24604.3</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>9.0.1-servicing.24610.6</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from /~https://github.com/dotnet/test-templates -->
Expand Down Expand Up @@ -130,8 +130,8 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from /~https://github.com/dotnet/windowsdesktop -->
<VSRedistCommonWindowsDesktopSharedFrameworkx6490PackageVersion>9.0.1-servicing.24604.4</VSRedistCommonWindowsDesktopSharedFrameworkx6490PackageVersion>
<VSRedistCommonWindowsDesktopTargetingPackx6490PackageVersion>9.0.1-servicing.24604.4</VSRedistCommonWindowsDesktopTargetingPackx6490PackageVersion>
<VSRedistCommonWindowsDesktopSharedFrameworkx6490PackageVersion>9.0.1-servicing.24610.4</VSRedistCommonWindowsDesktopSharedFrameworkx6490PackageVersion>
<VSRedistCommonWindowsDesktopTargetingPackx6490PackageVersion>9.0.1-servicing.24610.4</VSRedistCommonWindowsDesktopTargetingPackx6490PackageVersion>
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>9.0.1</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
<MicrosoftWindowsDesktopAppRefPackageVersion>9.0.1</MicrosoftWindowsDesktopAppRefPackageVersion>
</PropertyGroup>
Expand Down Expand Up @@ -237,8 +237,8 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from /~https://github.com/dotnet/wpf -->
<MicrosoftNETSdkWindowsDesktopPackageVersion>9.0.1-rtm.24604.3</MicrosoftNETSdkWindowsDesktopPackageVersion>
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>9.0.1-rtm.24604.3</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
<MicrosoftNETSdkWindowsDesktopPackageVersion>9.0.1-rtm.24610.3</MicrosoftNETSdkWindowsDesktopPackageVersion>
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>9.0.1-rtm.24610.3</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 02a158e

Please sign in to comment.