Skip to content

Commit

Permalink
[main] Update dependencies from dotnet/windowsdesktop (#46731)
Browse files Browse the repository at this point in the history 
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Noah Gilson <[email protected]>
Co-authored-by: Viktor Hofer <[email protected]>
  • Loading branch information
@dotnet-maestro @nagilson @ViktorHofer
4 people authored Feb 13, 2025
1 parent c64be6d commit e27b9f9
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 44 deletions.
28 changes: 14 additions & 14 deletions eng/Version.Details.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -278,26 +278,26 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>8c92ae710024f0cfa5c5cdd5bf3f6ccaec3ff98a</Sha>
</Dependency>
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="10.0.0-preview.2.25110.2">
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="10.0.0-preview.2.25112.1">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
<Sha>df9fc14baf6a39b9ccca77d83c9ce878e75901c3</Sha>
<Sha>771cf97cbe262229c3c522b113b8ff65209feb32</Sha>
<SourceBuildTarball RepoName="windowsdesktop" ManagedOnly="true" />
</Dependency>
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.10.0" Version="10.0.0-preview.2.25110.2">
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.10.0" Version="10.0.0-preview.2.25112.1">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
<Sha>df9fc14baf6a39b9ccca77d83c9ce878e75901c3</Sha>
<Sha>771cf97cbe262229c3c522b113b8ff65209feb32</Sha>
</Dependency>
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="10.0.0-preview.2.25110.2">
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="10.0.0-preview.2.25112.1">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
<Sha>df9fc14baf6a39b9ccca77d83c9ce878e75901c3</Sha>
<Sha>771cf97cbe262229c3c522b113b8ff65209feb32</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.10.0" Version="10.0.0-preview.2.25110.2">
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.10.0" Version="10.0.0-preview.2.25112.1">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
<Sha>df9fc14baf6a39b9ccca77d83c9ce878e75901c3</Sha>
<Sha>771cf97cbe262229c3c522b113b8ff65209feb32</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="10.0.0-preview.2.25110.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref">
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="10.0.0-preview.2.25111.6" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref">
<Uri>https://github.com/dotnet/wpf</Uri>
<Sha>de23c2fc588a3c8c26dd4e156a6ed4537db933e2</Sha>
<Sha>666571fc4aa05da077b1b13065a0060f545ad313</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="10.0.0-preview.2.25111.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.2.25105.4" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="10.0.0-preview.2.25111.4" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/winforms</Uri>
<Sha>ff1980207ae1affdb2c13c38e3fe1558f383fa15</Sha>
<Sha>b463fb593a56f45447aff9459984b2a2bc795e56</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="10.0.0-preview.2.25110.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="10.0.0-preview.2.25111.6" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/wpf</Uri>
<Sha>de23c2fc588a3c8c26dd4e156a6ed4537db933e2</Sha>
<Sha>666571fc4aa05da077b1b13065a0060f545ad313</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
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/winforms -->
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>10.0.0-preview.2.25105.4</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>10.0.0-preview.2.25111.4</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/runtime -->
Expand Down Expand Up @@ -140,9 +140,9 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
<VSRedistCommonWindowsDesktopSharedFrameworkx64100PackageVersion>10.0.0-preview.2.25110.2</VSRedistCommonWindowsDesktopSharedFrameworkx64100PackageVersion>
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>10.0.0-preview.2.25110.2</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
<MicrosoftWindowsDesktopAppRefPackageVersion>10.0.0-preview.2.25110.2</MicrosoftWindowsDesktopAppRefPackageVersion>
<VSRedistCommonWindowsDesktopSharedFrameworkx64100PackageVersion>10.0.0-preview.2.25112.1</VSRedistCommonWindowsDesktopSharedFrameworkx64100PackageVersion>
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>10.0.0-preview.2.25112.1</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
<MicrosoftWindowsDesktopAppRefPackageVersion>10.0.0-preview.2.25112.1</MicrosoftWindowsDesktopAppRefPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/nuget/nuget.client -->
Expand Down Expand Up @@ -253,8 +253,8 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/wpf -->
<MicrosoftNETSdkWindowsDesktopPackageVersion>10.0.0-preview.2.25110.2</MicrosoftNETSdkWindowsDesktopPackageVersion>
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>10.0.0-preview.2.25110.2</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
<MicrosoftNETSdkWindowsDesktopPackageVersion>10.0.0-preview.2.25111.6</MicrosoftNETSdkWindowsDesktopPackageVersion>
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>10.0.0-preview.2.25111.6</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
</PropertyGroup>
<PropertyGroup Label="Infrastructure and test only dependencies">
<VersionToolsVersion>2.2.0-beta.19072.10</VersionToolsVersion>
Expand Down
24 changes: 0 additions & 24 deletions src/SourceBuild/patches/winforms/0001-React-to-compiler-analyzer-warning-error.patch
View file

This file was deleted.

0 comments on commit e27b9f9

Please sign in to comment.