Skip to content

[main] Update dependencies from dotnet/windowsdesktop #47992

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Mar 31, 2025
Merged

[main] Update dependencies from dotnet/windowsdesktop #47992

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0ce5bb6
Update dependencies from https://github.com/dotnet/windowsdesktop bui…
dotnet-maestro[bot] Mar 28, 2025
a983c05
Update dependencies from https://github.com/dotnet/windowsdesktop bui…
dotnet-maestro[bot] Mar 29, 2025
90d50d3
Update dependencies from https://github.com/dotnet/windowsdesktop bui…
dotnet-maestro[bot] Mar 30, 2025
c1995e8
Delete src/SourceBuild/patches/winforms/0001-Condition-out-the-native…
ViktorHofer Mar 31, 2025
77d3fa1
Merge branch 'main' into darc-main-e3b7da1d-a1cb-414b-b610-a49c478868dd
ViktorHofer Mar 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,26 +278,26 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>65f01395f6af3131b9480e91671c8c96062bca11</Sha>
</Dependency>
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="10.0.0-preview.4.25177.2">
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="10.0.0-preview.4.25179.1">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
<Sha>bed6a81b30d9dabbb5aa6301c9e9152b671aed2a</Sha>
<Sha>8c1790a883361a09db2145842a5b0780bfe702bf</Sha>
<SourceBuildTarball RepoName="windowsdesktop" ManagedOnly="true" />
</Dependency>
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.10.0" Version="10.0.0-preview.4.25177.2">
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.10.0" Version="10.0.0-preview.4.25179.1">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
<Sha>bed6a81b30d9dabbb5aa6301c9e9152b671aed2a</Sha>
<Sha>8c1790a883361a09db2145842a5b0780bfe702bf</Sha>
</Dependency>
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="10.0.0-preview.4.25177.2">
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="10.0.0-preview.4.25179.1">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
<Sha>bed6a81b30d9dabbb5aa6301c9e9152b671aed2a</Sha>
<Sha>8c1790a883361a09db2145842a5b0780bfe702bf</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.10.0" Version="10.0.0-preview.4.25177.2">
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.10.0" Version="10.0.0-preview.4.25179.1">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
<Sha>bed6a81b30d9dabbb5aa6301c9e9152b671aed2a</Sha>
<Sha>8c1790a883361a09db2145842a5b0780bfe702bf</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="10.0.0-preview.4.25177.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref">
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="10.0.0-preview.4.25178.3" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref">
<Uri>https://github.com/dotnet/wpf</Uri>
<Sha>cfb8ddc81be25838a0d0c11142e04adbb4fc8903</Sha>
<Sha>2a8258a72936092b24082c3e19f88d4b3e7e1e02</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="10.0.0-preview.4.25178.6">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
Expand Down Expand Up @@ -445,13 +445,13 @@
<SourceBuild RepoName="razor" ManagedOnly="true" />
</Dependency>
<!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop -->
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="10.0.0-preview.4.25174.6" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="10.0.0-preview.4.25177.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/winforms</Uri>
<Sha>5e9dab651de1d8b4e8b379beac70319904ee1538</Sha>
<Sha>5d908dd29c55b43598b14ece5a8e5429b965c058</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="10.0.0-preview.4.25177.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="10.0.0-preview.4.25178.3" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/wpf</Uri>
<Sha>cfb8ddc81be25838a0d0c11142e04adbb4fc8903</Sha>
<Sha>2a8258a72936092b24082c3e19f88d4b3e7e1e02</Sha>
</Dependency>
<Dependency Name="Microsoft.Web.Xdt" Version="10.0.0-preview.25067.1">
<Uri>https://github.com/dotnet/xdt</Uri>
Expand Down
12 changes: 6 additions & 6 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/winforms -->
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>10.0.0-preview.4.25174.6</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>10.0.0-preview.4.25177.2</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/runtime -->
Expand Down Expand Up @@ -149,9 +149,9 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
<VSRedistCommonWindowsDesktopSharedFrameworkx64100PackageVersion>10.0.0-preview.4.25177.2</VSRedistCommonWindowsDesktopSharedFrameworkx64100PackageVersion>
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>10.0.0-preview.4.25177.2</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
<MicrosoftWindowsDesktopAppRefPackageVersion>10.0.0-preview.4.25177.2</MicrosoftWindowsDesktopAppRefPackageVersion>
<VSRedistCommonWindowsDesktopSharedFrameworkx64100PackageVersion>10.0.0-preview.4.25179.1</VSRedistCommonWindowsDesktopSharedFrameworkx64100PackageVersion>
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>10.0.0-preview.4.25179.1</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
<MicrosoftWindowsDesktopAppRefPackageVersion>10.0.0-preview.4.25179.1</MicrosoftWindowsDesktopAppRefPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/nuget/nuget.client -->
Expand Down Expand Up @@ -258,8 +258,8 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/wpf -->
<MicrosoftNETSdkWindowsDesktopPackageVersion>10.0.0-preview.4.25177.1</MicrosoftNETSdkWindowsDesktopPackageVersion>
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>10.0.0-preview.4.25177.1</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
<MicrosoftNETSdkWindowsDesktopPackageVersion>10.0.0-preview.4.25178.3</MicrosoftNETSdkWindowsDesktopPackageVersion>
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>10.0.0-preview.4.25178.3</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
</PropertyGroup>
<PropertyGroup Label="Infrastructure and test only dependencies">
<VersionToolsVersion>2.2.0-beta.19072.10</VersionToolsVersion>
Expand Down
23 changes: 0 additions & 23 deletions src/SourceBuild/patches/winforms/0001-Condition-out-the-native-tests-in-VMR.patch
View file
Open in desktop

This file was deleted.

Loading