Skip to content

Commit 2b8d9bf

Browse files
committed
Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0 From Version 9.0.3 -> To Version 9.0.4 Dependency coherency updates Microsoft.NET.Sdk.WindowsDesktop,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.DotNet.Wpf.ProjectTemplates From Version 9.0.3-rtm.25113.4 -> To Version 9.0.4-rtm.25164.2 (parent: Microsoft.WindowsDesktop.App.Ref
1 parent c3d00e7 commit 2b8d9bf

File tree

3 files changed

+23
-27
lines changed

3 files changed

+23
-27
lines changed

NuGet.config

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,7 @@
4141
<add key="darc-pub-dotnet-templating-43c42ac" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-43c42acf/nuget/v3/index.json" />
4242
<!-- End: Package sources from dotnet-templating -->
4343
<!-- Begin: Package sources from dotnet-windowsdesktop -->
44-
<add key="darc-int-dotnet-windowsdesktop-1c33258" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-1c33258c/nuget/v3/index.json" />
45-
<add key="darc-int-dotnet-windowsdesktop-1c33258-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-1c33258c-2/nuget/v3/index.json" />
46-
<add key="darc-int-dotnet-windowsdesktop-1c33258-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-1c33258c-1/nuget/v3/index.json" />
44+
<add key="darc-int-dotnet-windowsdesktop-6caea0d" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-6caea0d3/nuget/v3/index.json" />
4745
<!-- End: Package sources from dotnet-windowsdesktop -->
4846
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
4947
<add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
@@ -76,9 +74,7 @@
7674
<add key="darc-int-dotnet-runtime-f57e6dc" value="true" />
7775
<!-- End: Package sources from dotnet-runtime -->
7876
<!-- Begin: Package sources from dotnet-windowsdesktop -->
79-
<add key="darc-int-dotnet-windowsdesktop-1c33258-1" value="true" />
80-
<add key="darc-int-dotnet-windowsdesktop-1c33258-2" value="true" />
81-
<add key="darc-int-dotnet-windowsdesktop-1c33258" value="true" />
77+
<add key="darc-int-dotnet-windowsdesktop-6caea0d" value="true" />
8278
<!-- End: Package sources from dotnet-windowsdesktop -->
8379
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
8480
</disabledPackageSources>

eng/Version.Details.xml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -250,26 +250,26 @@
250250
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
251251
<Sha>f57e6dc747158ab7ade4e62a75a6750d16b771e8</Sha>
252252
</Dependency>
253-
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="9.0.3">
253+
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="9.0.4">
254254
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
255-
<Sha>1c33258cdd6220239735d6a7a18ef6adc082038c</Sha>
255+
<Sha>6caea0d3a33c1eeaaa4270cfe448354e7cfa6b1e</Sha>
256256
<SourceBuildTarball RepoName="windowsdesktop" ManagedOnly="true" />
257257
</Dependency>
258-
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0" Version="9.0.3-servicing.25113.2">
258+
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0" Version="9.0.4-servicing.25164.2">
259259
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
260-
<Sha>1c33258cdd6220239735d6a7a18ef6adc082038c</Sha>
260+
<Sha>6caea0d3a33c1eeaaa4270cfe448354e7cfa6b1e</Sha>
261261
</Dependency>
262-
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="9.0.3">
262+
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="9.0.4">
263263
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
264-
<Sha>1c33258cdd6220239735d6a7a18ef6adc082038c</Sha>
264+
<Sha>6caea0d3a33c1eeaaa4270cfe448354e7cfa6b1e</Sha>
265265
</Dependency>
266-
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0" Version="9.0.3-servicing.25113.2">
266+
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0" Version="9.0.4-servicing.25164.2">
267267
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
268-
<Sha>1c33258cdd6220239735d6a7a18ef6adc082038c</Sha>
268+
<Sha>6caea0d3a33c1eeaaa4270cfe448354e7cfa6b1e</Sha>
269269
</Dependency>
270-
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="9.0.3-rtm.25113.4" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref">
270+
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="9.0.4-rtm.25164.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref">
271271
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
272-
<Sha>f58f709bc102a0d15aa6ffe4d9a7435bebd3079e</Sha>
272+
<Sha>33f5371cc258de0a72569adf1e9fbcbf04256a17</Sha>
273273
</Dependency>
274274
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="9.0.4">
275275
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
@@ -356,13 +356,13 @@
356356
<Sha>d5dc8a13cc618b9cbdc1e5744b4806c594d49553</Sha>
357357
</Dependency>
358358
<!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop -->
359-
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="9.0.3-servicing.25112.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
359+
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="9.0.4-servicing.25163.12" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
360360
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
361-
<Sha>5bf1bff0e58e41f748a8a6d7c666ed28e033e318</Sha>
361+
<Sha>ca42d9e58480ab4ebb845027c44c6b4f10e0539d</Sha>
362362
</Dependency>
363-
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="9.0.3-rtm.25113.4" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
363+
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="9.0.4-rtm.25164.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
364364
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
365-
<Sha>f58f709bc102a0d15aa6ffe4d9a7435bebd3079e</Sha>
365+
<Sha>33f5371cc258de0a72569adf1e9fbcbf04256a17</Sha>
366366
</Dependency>
367367
<Dependency Name="Microsoft.Web.Xdt" Version="10.0.0-preview.24609.2">
368368
<Uri>https://github.com/dotnet/xdt</Uri>

eng/Versions.props

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080
</PropertyGroup>
8181
<PropertyGroup>
8282
<!-- Dependency from https://github.com/dotnet/winforms -->
83-
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>9.0.3-servicing.25112.2</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
83+
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>9.0.4-servicing.25163.12</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
8484
</PropertyGroup>
8585
<PropertyGroup>
8686
<!-- Dependencies from https://github.com/dotnet/runtime -->
@@ -128,10 +128,10 @@
128128
</PropertyGroup>
129129
<PropertyGroup>
130130
<!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
131-
<VSRedistCommonWindowsDesktopSharedFrameworkx6490PackageVersion>9.0.3-servicing.25113.2</VSRedistCommonWindowsDesktopSharedFrameworkx6490PackageVersion>
132-
<VSRedistCommonWindowsDesktopTargetingPackx6490PackageVersion>9.0.3-servicing.25113.2</VSRedistCommonWindowsDesktopTargetingPackx6490PackageVersion>
133-
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>9.0.3</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
134-
<MicrosoftWindowsDesktopAppRefPackageVersion>9.0.3</MicrosoftWindowsDesktopAppRefPackageVersion>
131+
<VSRedistCommonWindowsDesktopSharedFrameworkx6490PackageVersion>9.0.4-servicing.25164.2</VSRedistCommonWindowsDesktopSharedFrameworkx6490PackageVersion>
132+
<VSRedistCommonWindowsDesktopTargetingPackx6490PackageVersion>9.0.4-servicing.25164.2</VSRedistCommonWindowsDesktopTargetingPackx6490PackageVersion>
133+
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>9.0.4</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
134+
<MicrosoftWindowsDesktopAppRefPackageVersion>9.0.4</MicrosoftWindowsDesktopAppRefPackageVersion>
135135
</PropertyGroup>
136136
<PropertyGroup>
137137
<!-- Dependencies from https://github.com/nuget/nuget.client -->
@@ -235,8 +235,8 @@
235235
</PropertyGroup>
236236
<PropertyGroup>
237237
<!-- Dependencies from https://github.com/dotnet/wpf -->
238-
<MicrosoftNETSdkWindowsDesktopPackageVersion>9.0.3-rtm.25113.4</MicrosoftNETSdkWindowsDesktopPackageVersion>
239-
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>9.0.3-rtm.25113.4</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
238+
<MicrosoftNETSdkWindowsDesktopPackageVersion>9.0.4-rtm.25164.2</MicrosoftNETSdkWindowsDesktopPackageVersion>
239+
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>9.0.4-rtm.25164.2</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
240240
</PropertyGroup>
241241
<PropertyGroup Label="Runtime and Apphost aliases">
242242
<!-- 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)