Skip to content

Commit 1ba80b0

Browse files
ProductConstructionServiceProdvseanreesermsft
ProductConstructionServiceProd
authored and
vseanreesermsft
committed
Merged PR 46853: [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.1-rtm.24610.3 to 9.0.2-rtm.25067.2 (parent: Microsoft.WindowsDesktop.App.Ref) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 9.0.1-servicing.24610.6 to 9.0.2-servicing.25066.8 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 9.0.1-rtm.24610.3 to 9.0.2-rtm.25067.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**: 20250117.4 - **Date Produced**: January 17, 2025 6:37:15 PM UTC - **Commit**: f971ec245a9aa0e7677b2fe6a565e2979cc59fde - **Branch**: refs/heads/internal/release/9.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.WindowsDesktop.App.Ref**: [from 9.0.1 to 9.0.2][1] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 9.0.1 to 9.0.2][1] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0**: [from 9.0.1-servicing.24610.4 to 9.0.2-servicing.25067.4][1] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0**: [from 9.0.1-servicing.24610.4 to 9.0.2-servicing.25067.4][1] - **Microsoft.NET.Sdk.WindowsDesktop**: [from 9.0.1-rtm.24610.3 to 9.0.2-rtm.25067.2][2] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 9.0.1-servicing.24610.6 to 9.0.2-servicing.25066.8][3] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 9.0.1-rtm.24610.3 to 9.0.2-rtm.25067.2][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GCaf254ce17dd6827439a1e51006ddf804a0093a13&targetVersion=GCf971ec245a9aa0e7677b2fe6a565e2979cc59fde&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-wpf/branches?baseVersion=GCf26d48cd826cfd41bed05708d1cdc9e219bf8514&targetVersion=GC6498db3ee0fbc2790831b28cd47a7b8ef500cb17&_a=files [3]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC5a82e6f3c764285d3e2c5307e46fd5cbd546c7cd&targetVersion=GCf15a0b2339942cc52d7c24cb82739d8401ead77f&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:87db4525-6885-42da-8dd0-7ce296d7fd1a)
1 parent 6e1a79d commit 1ba80b0

File tree

3 files changed

+23
-39
lines changed

3 files changed

+23
-39
lines changed

‎NuGet.config

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,7 @@
3434
<add key="darc-pub-dotnet-templating-f46c70a" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-f46c70ab/nuget/v3/index.json" />
3535
<!-- End: Package sources from dotnet-templating -->
3636
<!-- Begin: Package sources from dotnet-windowsdesktop -->
37-
<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" />
38-
<add key="darc-int-dotnet-windowsdesktop-af254ce-8" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-af254ce1-8/nuget/v3/index.json" />
39-
<add key="darc-int-dotnet-windowsdesktop-af254ce-7" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-af254ce1-7/nuget/v3/index.json" />
40-
<add key="darc-int-dotnet-windowsdesktop-af254ce-6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-af254ce1-6/nuget/v3/index.json" />
41-
<add key="darc-int-dotnet-windowsdesktop-af254ce-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-af254ce1-5/nuget/v3/index.json" />
42-
<add key="darc-int-dotnet-windowsdesktop-af254ce-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-af254ce1-4/nuget/v3/index.json" />
43-
<add key="darc-int-dotnet-windowsdesktop-af254ce-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-af254ce1-3/nuget/v3/index.json" />
44-
<add key="darc-int-dotnet-windowsdesktop-af254ce-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-af254ce1-2/nuget/v3/index.json" />
45-
<add key="darc-int-dotnet-windowsdesktop-af254ce-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-af254ce1-1/nuget/v3/index.json" />
37+
<add key="darc-int-dotnet-windowsdesktop-f971ec2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-f971ec24/nuget/v3/index.json" />
4638
<!-- End: Package sources from dotnet-windowsdesktop -->
4739
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
4840
<add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
@@ -83,15 +75,7 @@
8375
<add key="darc-int-dotnet-runtime-80aa709" value="true" />
8476
<!-- End: Package sources from dotnet-runtime -->
8577
<!-- Begin: Package sources from dotnet-windowsdesktop -->
86-
<add key="darc-int-dotnet-windowsdesktop-af254ce-1" value="true" />
87-
<add key="darc-int-dotnet-windowsdesktop-af254ce-2" value="true" />
88-
<add key="darc-int-dotnet-windowsdesktop-af254ce-3" value="true" />
89-
<add key="darc-int-dotnet-windowsdesktop-af254ce-4" value="true" />
90-
<add key="darc-int-dotnet-windowsdesktop-af254ce-5" value="true" />
91-
<add key="darc-int-dotnet-windowsdesktop-af254ce-6" value="true" />
92-
<add key="darc-int-dotnet-windowsdesktop-af254ce-7" value="true" />
93-
<add key="darc-int-dotnet-windowsdesktop-af254ce-8" value="true" />
94-
<add key="darc-int-dotnet-windowsdesktop-af254ce" value="true" />
78+
<add key="darc-int-dotnet-windowsdesktop-f971ec2" value="true" />
9579
<!-- End: Package sources from dotnet-windowsdesktop -->
9680
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
9781
</disabledPackageSources>

‎eng/Version.Details.xml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -254,26 +254,26 @@
254254
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
255255
<Sha>80aa709f5d919c6814726788dc6dabe23e79e672</Sha>
256256
</Dependency>
257-
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="9.0.1">
257+
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="9.0.2">
258258
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
259-
<Sha>af254ce17dd6827439a1e51006ddf804a0093a13</Sha>
259+
<Sha>f971ec245a9aa0e7677b2fe6a565e2979cc59fde</Sha>
260260
<SourceBuildTarball RepoName="windowsdesktop" ManagedOnly="true" />
261261
</Dependency>
262-
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0" Version="9.0.1-servicing.24610.4">
262+
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0" Version="9.0.2-servicing.25067.4">
263263
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
264-
<Sha>af254ce17dd6827439a1e51006ddf804a0093a13</Sha>
264+
<Sha>f971ec245a9aa0e7677b2fe6a565e2979cc59fde</Sha>
265265
</Dependency>
266-
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="9.0.1">
266+
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="9.0.2">
267267
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
268-
<Sha>af254ce17dd6827439a1e51006ddf804a0093a13</Sha>
268+
<Sha>f971ec245a9aa0e7677b2fe6a565e2979cc59fde</Sha>
269269
</Dependency>
270-
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0" Version="9.0.1-servicing.24610.4">
270+
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0" Version="9.0.2-servicing.25067.4">
271271
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
272-
<Sha>af254ce17dd6827439a1e51006ddf804a0093a13</Sha>
272+
<Sha>f971ec245a9aa0e7677b2fe6a565e2979cc59fde</Sha>
273273
</Dependency>
274-
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="9.0.1-rtm.24610.3" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref">
274+
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="9.0.2-rtm.25067.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref">
275275
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
276-
<Sha>f26d48cd826cfd41bed05708d1cdc9e219bf8514</Sha>
276+
<Sha>6498db3ee0fbc2790831b28cd47a7b8ef500cb17</Sha>
277277
</Dependency>
278278
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="9.0.1">
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.1-servicing.24610.6" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
393+
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="9.0.2-servicing.25066.8" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
394394
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
395-
<Sha>5a82e6f3c764285d3e2c5307e46fd5cbd546c7cd</Sha>
395+
<Sha>f15a0b2339942cc52d7c24cb82739d8401ead77f</Sha>
396396
</Dependency>
397-
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="9.0.1-rtm.24610.3" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
397+
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="9.0.2-rtm.25067.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
398398
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
399-
<Sha>f26d48cd826cfd41bed05708d1cdc9e219bf8514</Sha>
399+
<Sha>6498db3ee0fbc2790831b28cd47a7b8ef500cb17</Sha>
400400
</Dependency>
401401
<Dependency Name="Microsoft.Web.Xdt" Version="10.0.0-preview.24609.2">
402402
<Uri>https://github.com/dotnet/xdt</Uri>

‎eng/Versions.props

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
</PropertyGroup>
7878
<PropertyGroup>
7979
<!-- Dependency from https://github.com/dotnet/winforms -->
80-
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>9.0.1-servicing.24610.6</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
80+
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>9.0.2-servicing.25066.8</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
8181
</PropertyGroup>
8282
<PropertyGroup>
8383
<!-- Dependency from https://github.com/dotnet/test-templates -->
@@ -130,10 +130,10 @@
130130
</PropertyGroup>
131131
<PropertyGroup>
132132
<!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
133-
<VSRedistCommonWindowsDesktopSharedFrameworkx6490PackageVersion>9.0.1-servicing.24610.4</VSRedistCommonWindowsDesktopSharedFrameworkx6490PackageVersion>
134-
<VSRedistCommonWindowsDesktopTargetingPackx6490PackageVersion>9.0.1-servicing.24610.4</VSRedistCommonWindowsDesktopTargetingPackx6490PackageVersion>
135-
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>9.0.1</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
136-
<MicrosoftWindowsDesktopAppRefPackageVersion>9.0.1</MicrosoftWindowsDesktopAppRefPackageVersion>
133+
<VSRedistCommonWindowsDesktopSharedFrameworkx6490PackageVersion>9.0.2-servicing.25067.4</VSRedistCommonWindowsDesktopSharedFrameworkx6490PackageVersion>
134+
<VSRedistCommonWindowsDesktopTargetingPackx6490PackageVersion>9.0.2-servicing.25067.4</VSRedistCommonWindowsDesktopTargetingPackx6490PackageVersion>
135+
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>9.0.2</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
136+
<MicrosoftWindowsDesktopAppRefPackageVersion>9.0.2</MicrosoftWindowsDesktopAppRefPackageVersion>
137137
</PropertyGroup>
138138
<PropertyGroup>
139139
<!-- Dependencies from https://github.com/nuget/nuget.client -->
@@ -237,8 +237,8 @@
237237
</PropertyGroup>
238238
<PropertyGroup>
239239
<!-- Dependencies from https://github.com/dotnet/wpf -->
240-
<MicrosoftNETSdkWindowsDesktopPackageVersion>9.0.1-rtm.24610.3</MicrosoftNETSdkWindowsDesktopPackageVersion>
241-
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>9.0.1-rtm.24610.3</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
240+
<MicrosoftNETSdkWindowsDesktopPackageVersion>9.0.2-rtm.25067.2</MicrosoftNETSdkWindowsDesktopPackageVersion>
241+
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>9.0.2-rtm.25067.2</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
242242
</PropertyGroup>
243243
<PropertyGroup Label="Runtime and Apphost aliases">
244244
<!-- 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)