Skip to content

Commit 02a158e

Browse files
maestro-prod-PrimarymarcpopMSFT
authored andcommitted
Merged PR 45866: [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.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)
1 parent e38ff25 commit 02a158e

File tree

3 files changed

+19
-21
lines changed

3 files changed

+19
-21
lines changed

NuGet.config

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@
2424
<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" />
2525
<!-- End: Package sources from dotnet-templating -->
2626
<!-- Begin: Package sources from dotnet-windowsdesktop -->
27-
<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" />
28-
<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" />
27+
<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" />
2928
<!-- End: Package sources from dotnet-windowsdesktop -->
3029
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
3130
<add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
@@ -58,8 +57,7 @@
5857
<add key="darc-int-dotnet-runtime-c8acea2" value="true" />
5958
<!-- End: Package sources from dotnet-runtime -->
6059
<!-- Begin: Package sources from dotnet-windowsdesktop -->
61-
<add key="darc-int-dotnet-windowsdesktop-1db7b9d-1" value="true" />
62-
<add key="darc-int-dotnet-windowsdesktop-1db7b9d" value="true" />
60+
<add key="darc-int-dotnet-windowsdesktop-af254ce" value="true" />
6361
<!-- End: Package sources from dotnet-windowsdesktop -->
6462
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
6563
</disabledPackageSources>

eng/Version.Details.xml

Lines changed: 12 additions & 12 deletions
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.1">
258258
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
259-
<Sha>1db7b9dd6405faab770fe63d6fe0acbce686ffa9</Sha>
259+
<Sha>af254ce17dd6827439a1e51006ddf804a0093a13</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.24604.4">
262+
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0" Version="9.0.1-servicing.24610.4">
263263
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
264-
<Sha>1db7b9dd6405faab770fe63d6fe0acbce686ffa9</Sha>
264+
<Sha>af254ce17dd6827439a1e51006ddf804a0093a13</Sha>
265265
</Dependency>
266266
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="9.0.1">
267267
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
268-
<Sha>1db7b9dd6405faab770fe63d6fe0acbce686ffa9</Sha>
268+
<Sha>af254ce17dd6827439a1e51006ddf804a0093a13</Sha>
269269
</Dependency>
270-
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0" Version="9.0.1-servicing.24604.4">
270+
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0" Version="9.0.1-servicing.24610.4">
271271
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
272-
<Sha>1db7b9dd6405faab770fe63d6fe0acbce686ffa9</Sha>
272+
<Sha>af254ce17dd6827439a1e51006ddf804a0093a13</Sha>
273273
</Dependency>
274-
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="9.0.1-rtm.24604.3" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref">
274+
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="9.0.1-rtm.24610.3" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref">
275275
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
276-
<Sha>aaef42794203f462cc23c0ffab4086108938182e</Sha>
276+
<Sha>f26d48cd826cfd41bed05708d1cdc9e219bf8514</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.24604.3" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
393+
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="9.0.1-servicing.24610.6" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
394394
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
395-
<Sha>a0809427d515428bce23e14fe9ca6214d19054c4</Sha>
395+
<Sha>5a82e6f3c764285d3e2c5307e46fd5cbd546c7cd</Sha>
396396
</Dependency>
397-
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="9.0.1-rtm.24604.3" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
397+
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="9.0.1-rtm.24610.3" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
398398
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
399-
<Sha>aaef42794203f462cc23c0ffab4086108938182e</Sha>
399+
<Sha>f26d48cd826cfd41bed05708d1cdc9e219bf8514</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

Lines changed: 5 additions & 5 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.24604.3</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
80+
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>9.0.1-servicing.24610.6</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
8181
</PropertyGroup>
8282
<PropertyGroup>
8383
<!-- Dependency from https://github.com/dotnet/test-templates -->
@@ -130,8 +130,8 @@
130130
</PropertyGroup>
131131
<PropertyGroup>
132132
<!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
133-
<VSRedistCommonWindowsDesktopSharedFrameworkx6490PackageVersion>9.0.1-servicing.24604.4</VSRedistCommonWindowsDesktopSharedFrameworkx6490PackageVersion>
134-
<VSRedistCommonWindowsDesktopTargetingPackx6490PackageVersion>9.0.1-servicing.24604.4</VSRedistCommonWindowsDesktopTargetingPackx6490PackageVersion>
133+
<VSRedistCommonWindowsDesktopSharedFrameworkx6490PackageVersion>9.0.1-servicing.24610.4</VSRedistCommonWindowsDesktopSharedFrameworkx6490PackageVersion>
134+
<VSRedistCommonWindowsDesktopTargetingPackx6490PackageVersion>9.0.1-servicing.24610.4</VSRedistCommonWindowsDesktopTargetingPackx6490PackageVersion>
135135
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>9.0.1</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
136136
<MicrosoftWindowsDesktopAppRefPackageVersion>9.0.1</MicrosoftWindowsDesktopAppRefPackageVersion>
137137
</PropertyGroup>
@@ -237,8 +237,8 @@
237237
</PropertyGroup>
238238
<PropertyGroup>
239239
<!-- Dependencies from https://github.com/dotnet/wpf -->
240-
<MicrosoftNETSdkWindowsDesktopPackageVersion>9.0.1-rtm.24604.3</MicrosoftNETSdkWindowsDesktopPackageVersion>
241-
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>9.0.1-rtm.24604.3</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
240+
<MicrosoftNETSdkWindowsDesktopPackageVersion>9.0.1-rtm.24610.3</MicrosoftNETSdkWindowsDesktopPackageVersion>
241+
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>9.0.1-rtm.24610.3</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)