Skip to content

Commit 71b8c10

Browse files
[main] Update dependencies from dotnet/windowsdesktop (#46596)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Viktor Hofer <[email protected]>
1 parent c58fedd commit 71b8c10

File tree

3 files changed

+17
-41
lines changed

3 files changed

+17
-41
lines changed

eng/Version.Details.xml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -278,26 +278,26 @@
278278
<Uri>https://github.com/dotnet/runtime</Uri>
279279
<Sha>37b1764e19aceaa545d8433c490b850538b8905a</Sha>
280280
</Dependency>
281-
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="10.0.0-preview.2.25105.2">
281+
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="10.0.0-preview.2.25105.4">
282282
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
283-
<Sha>f24c18ea69f0b6ab7afb13c3a38a1d0b1d22c3d8</Sha>
283+
<Sha>d868d0786b95e122c4281e92ba8f3861d9a9daf1</Sha>
284284
<SourceBuildTarball RepoName="windowsdesktop" ManagedOnly="true" />
285285
</Dependency>
286-
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.10.0" Version="10.0.0-preview.2.25105.2">
286+
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.10.0" Version="10.0.0-preview.2.25105.4">
287287
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
288-
<Sha>f24c18ea69f0b6ab7afb13c3a38a1d0b1d22c3d8</Sha>
288+
<Sha>d868d0786b95e122c4281e92ba8f3861d9a9daf1</Sha>
289289
</Dependency>
290-
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="10.0.0-preview.2.25105.2">
290+
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="10.0.0-preview.2.25105.4">
291291
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
292-
<Sha>f24c18ea69f0b6ab7afb13c3a38a1d0b1d22c3d8</Sha>
292+
<Sha>d868d0786b95e122c4281e92ba8f3861d9a9daf1</Sha>
293293
</Dependency>
294-
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.10.0" Version="10.0.0-preview.2.25105.2">
294+
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.10.0" Version="10.0.0-preview.2.25105.4">
295295
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
296-
<Sha>f24c18ea69f0b6ab7afb13c3a38a1d0b1d22c3d8</Sha>
296+
<Sha>d868d0786b95e122c4281e92ba8f3861d9a9daf1</Sha>
297297
</Dependency>
298-
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="10.0.0-preview.2.25105.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref">
298+
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="10.0.0-preview.2.25105.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref">
299299
<Uri>https://github.com/dotnet/wpf</Uri>
300-
<Sha>bc243c8c5fee1a19216b58b234310cf76f3f843b</Sha>
300+
<Sha>9b00d1e993005413bf24ee662be73b4791d0421c</Sha>
301301
</Dependency>
302302
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="10.0.0-preview.2.25105.7">
303303
<Uri>https://github.com/dotnet/aspnetcore</Uri>
@@ -449,9 +449,9 @@
449449
<Uri>https://github.com/dotnet/winforms</Uri>
450450
<Sha>545f592509c017fc9acb3d97ae2f687614edeb04</Sha>
451451
</Dependency>
452-
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="10.0.0-preview.2.25105.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
452+
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="10.0.0-preview.2.25105.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
453453
<Uri>https://github.com/dotnet/wpf</Uri>
454-
<Sha>bc243c8c5fee1a19216b58b234310cf76f3f843b</Sha>
454+
<Sha>9b00d1e993005413bf24ee662be73b4791d0421c</Sha>
455455
</Dependency>
456456
<Dependency Name="Microsoft.Web.Xdt" Version="10.0.0-preview.25067.1">
457457
<Uri>https://github.com/dotnet/xdt</Uri>

eng/Versions.props

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -139,9 +139,9 @@
139139
</PropertyGroup>
140140
<PropertyGroup>
141141
<!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
142-
<VSRedistCommonWindowsDesktopSharedFrameworkx64100PackageVersion>10.0.0-preview.2.25105.2</VSRedistCommonWindowsDesktopSharedFrameworkx64100PackageVersion>
143-
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>10.0.0-preview.2.25105.2</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
144-
<MicrosoftWindowsDesktopAppRefPackageVersion>10.0.0-preview.2.25105.2</MicrosoftWindowsDesktopAppRefPackageVersion>
142+
<VSRedistCommonWindowsDesktopSharedFrameworkx64100PackageVersion>10.0.0-preview.2.25105.4</VSRedistCommonWindowsDesktopSharedFrameworkx64100PackageVersion>
143+
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>10.0.0-preview.2.25105.4</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
144+
<MicrosoftWindowsDesktopAppRefPackageVersion>10.0.0-preview.2.25105.4</MicrosoftWindowsDesktopAppRefPackageVersion>
145145
</PropertyGroup>
146146
<PropertyGroup>
147147
<!-- Dependencies from https://github.com/nuget/nuget.client -->
@@ -252,8 +252,8 @@
252252
</PropertyGroup>
253253
<PropertyGroup>
254254
<!-- Dependencies from https://github.com/dotnet/wpf -->
255-
<MicrosoftNETSdkWindowsDesktopPackageVersion>10.0.0-preview.2.25105.1</MicrosoftNETSdkWindowsDesktopPackageVersion>
256-
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>10.0.0-preview.2.25105.1</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
255+
<MicrosoftNETSdkWindowsDesktopPackageVersion>10.0.0-preview.2.25105.2</MicrosoftNETSdkWindowsDesktopPackageVersion>
256+
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>10.0.0-preview.2.25105.2</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
257257
</PropertyGroup>
258258
<PropertyGroup Label="Infrastructure and test only dependencies">
259259
<VersionToolsVersion>2.2.0-beta.19072.10</VersionToolsVersion>

src/SourceBuild/patches/wpf/0004-Fix-the-ArtifactsPackagingDir-on-win-x64.patch

Lines changed: 0 additions & 24 deletions
This file was deleted.

0 commit comments

Comments
 (0)