Skip to content

Commit 9f2317a

Browse files
maestro-prod-Primarywtgodbe
maestro-prod-Primary
authored and
wtgodbe
committed
Merged PR 44480: [internal/release/9.0.1xx] Update dependencies from 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)
1 parent b1e7cb6 commit 9f2317a

File tree

3 files changed

+19
-25
lines changed

3 files changed

+19
-25
lines changed

‎NuGet.config

+2-8
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,7 @@
3030
<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" />
3131
<!-- End: Package sources from dotnet-templating -->
3232
<!-- Begin: Package sources from dotnet-windowsdesktop -->
33-
<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" />
34-
<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" />
35-
<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" />
36-
<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" />
33+
<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" />
3734
<!-- End: Package sources from dotnet-windowsdesktop -->
3835
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
3936
<add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
@@ -68,10 +65,7 @@
6865
<add key="darc-int-dotnet-runtime-9d5a6a9" value="true" />
6966
<!-- End: Package sources from dotnet-runtime -->
7067
<!-- Begin: Package sources from dotnet-windowsdesktop -->
71-
<add key="darc-int-dotnet-windowsdesktop-2e5178f-1" value="true" />
72-
<add key="darc-int-dotnet-windowsdesktop-2e5178f-2" value="true" />
73-
<add key="darc-int-dotnet-windowsdesktop-2e5178f-3" value="true" />
74-
<add key="darc-int-dotnet-windowsdesktop-2e5178f" value="true" />
68+
<add key="darc-int-dotnet-windowsdesktop-308dc79" value="true" />
7569
<!-- End: Package sources from dotnet-windowsdesktop -->
7670
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
7771
</disabledPackageSources>

‎eng/Version.Details.xml

+12-12
Original file line numberDiff line numberDiff line change
@@ -256,24 +256,24 @@
256256
</Dependency>
257257
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="9.0.0">
258258
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
259-
<Sha>2e5178f9d725c4becd3f04f9627f9e45d7469f03</Sha>
259+
<Sha>308dc7955704be60afc72ec00902cc18e028c3c2</Sha>
260260
<SourceBuildTarball RepoName="windowsdesktop" ManagedOnly="true" />
261261
</Dependency>
262-
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0" Version="9.0.0-rtm.24523.5">
262+
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0" Version="9.0.0-rtm.24529.2">
263263
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
264-
<Sha>2e5178f9d725c4becd3f04f9627f9e45d7469f03</Sha>
264+
<Sha>308dc7955704be60afc72ec00902cc18e028c3c2</Sha>
265265
</Dependency>
266266
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="9.0.0">
267267
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
268-
<Sha>2e5178f9d725c4becd3f04f9627f9e45d7469f03</Sha>
268+
<Sha>308dc7955704be60afc72ec00902cc18e028c3c2</Sha>
269269
</Dependency>
270-
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0" Version="9.0.0-rtm.24523.5">
270+
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0" Version="9.0.0-rtm.24529.2">
271271
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
272-
<Sha>2e5178f9d725c4becd3f04f9627f9e45d7469f03</Sha>
272+
<Sha>308dc7955704be60afc72ec00902cc18e028c3c2</Sha>
273273
</Dependency>
274-
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="9.0.0-rtm.24523.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref">
274+
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="9.0.0-rtm.24529.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref">
275275
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
276-
<Sha>c23c8e8b764b527c6bf96b8f38379faae3c4dc1d</Sha>
276+
<Sha>a04736acb8edb533756131d3d5fc55f15cd03d6a</Sha>
277277
</Dependency>
278278
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="9.0.0">
279279
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
@@ -390,13 +390,13 @@
390390
<SourceBuild RepoName="test-templates" ManagedOnly="true" />
391391
</Dependency>
392392
<!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop -->
393-
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="9.0.0-rtm.24523.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
393+
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="9.0.0-rtm.24529.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
394394
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
395-
<Sha>bcf70f48f3ad07c7747c64601348e1df81f1f19e</Sha>
395+
<Sha>62ebdb4b0d5cc7e163b8dc9331dc196e576bf162</Sha>
396396
</Dependency>
397-
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="9.0.0-rtm.24523.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
397+
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="9.0.0-rtm.24529.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
398398
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
399-
<Sha>c23c8e8b764b527c6bf96b8f38379faae3c4dc1d</Sha>
399+
<Sha>a04736acb8edb533756131d3d5fc55f15cd03d6a</Sha>
400400
</Dependency>
401401
<Dependency Name="Microsoft.Web.Xdt" Version="9.0.0-preview.24522.2">
402402
<Uri>https://github.com/dotnet/xdt</Uri>

‎eng/Versions.props

+5-5
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393
</PropertyGroup>
9494
<PropertyGroup>
9595
<!-- Dependency from https://github.com/dotnet/winforms -->
96-
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>9.0.0-rtm.24523.2</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
96+
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>9.0.0-rtm.24529.1</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
9797
</PropertyGroup>
9898
<PropertyGroup>
9999
<!-- Dependency from https://github.com/dotnet/test-templates -->
@@ -146,8 +146,8 @@
146146
</PropertyGroup>
147147
<PropertyGroup>
148148
<!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
149-
<VSRedistCommonWindowsDesktopSharedFrameworkx6490PackageVersion>9.0.0-rtm.24523.5</VSRedistCommonWindowsDesktopSharedFrameworkx6490PackageVersion>
150-
<VSRedistCommonWindowsDesktopTargetingPackx6490PackageVersion>9.0.0-rtm.24523.5</VSRedistCommonWindowsDesktopTargetingPackx6490PackageVersion>
149+
<VSRedistCommonWindowsDesktopSharedFrameworkx6490PackageVersion>9.0.0-rtm.24529.2</VSRedistCommonWindowsDesktopSharedFrameworkx6490PackageVersion>
150+
<VSRedistCommonWindowsDesktopTargetingPackx6490PackageVersion>9.0.0-rtm.24529.2</VSRedistCommonWindowsDesktopTargetingPackx6490PackageVersion>
151151
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>9.0.0</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
152152
<MicrosoftWindowsDesktopAppRefPackageVersion>9.0.0</MicrosoftWindowsDesktopAppRefPackageVersion>
153153
</PropertyGroup>
@@ -253,8 +253,8 @@
253253
</PropertyGroup>
254254
<PropertyGroup>
255255
<!-- Dependencies from https://github.com/dotnet/wpf -->
256-
<MicrosoftNETSdkWindowsDesktopPackageVersion>9.0.0-rtm.24523.2</MicrosoftNETSdkWindowsDesktopPackageVersion>
257-
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>9.0.0-rtm.24523.2</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
256+
<MicrosoftNETSdkWindowsDesktopPackageVersion>9.0.0-rtm.24529.2</MicrosoftNETSdkWindowsDesktopPackageVersion>
257+
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>9.0.0-rtm.24529.2</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
258258
</PropertyGroup>
259259
<PropertyGroup Label="Runtime and Apphost aliases">
260260
<!-- 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. -->

0 commit comments

Comments
 (0)