Skip to content

Commit

Permalink
[main] Update dependencies from dotnet/windowsdesktop (#45597)
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: Viktor Hofer <viktor.hofer@microsoft.com>
Co-authored-by: Jason Zhai <v-wuzhai@microsoft.com>
  • Loading branch information
@dotnet-maestro @ViktorHofer @v-wuzhai
4 people authored Dec 23, 2024
1 parent d6ef148 commit 0d646c2
Show file tree
Hide file tree
Showing 4 changed files with 21 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 @@ -254,26 +254,26 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>57ab984bd0dbbacd02315d41e09144d2823e9475</Sha>
</Dependency>
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="10.0.0-alpha.1.24607.1">
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="10.0.0-alpha.1.24622.1">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
<Sha>9bae053da57e9108b4bc4dd8f713eaebf61331a0</Sha>
<Sha>972ad14abc8ab7372f8d56147ff2082d3544685c</Sha>
<SourceBuildTarball RepoName="windowsdesktop" ManagedOnly="true" />
</Dependency>
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.10.0" Version="10.0.0-alpha.1.24607.1">
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.10.0" Version="10.0.0-alpha.1.24622.1">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
<Sha>9bae053da57e9108b4bc4dd8f713eaebf61331a0</Sha>
<Sha>972ad14abc8ab7372f8d56147ff2082d3544685c</Sha>
</Dependency>
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="10.0.0-alpha.1.24607.1">
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="10.0.0-alpha.1.24622.1">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
<Sha>9bae053da57e9108b4bc4dd8f713eaebf61331a0</Sha>
<Sha>972ad14abc8ab7372f8d56147ff2082d3544685c</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.10.0" Version="10.0.0-alpha.1.24607.1">
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.10.0" Version="10.0.0-alpha.1.24622.1">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
<Sha>9bae053da57e9108b4bc4dd8f713eaebf61331a0</Sha>
<Sha>972ad14abc8ab7372f8d56147ff2082d3544685c</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="10.0.0-alpha.1.24605.3" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref">
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="10.0.0-alpha.1.24619.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref">
<Uri>https://github.com/dotnet/wpf</Uri>
<Sha>c6bff274b42ea186c4a53aab6e6447cf92aeb1e1</Sha>
<Sha>6cdf5bc75531e8f277c5a622fd87a9c291a15f22</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="10.0.0-alpha.2.24620.2">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
Expand Down Expand Up @@ -360,13 +360,13 @@
<Sha>794124fda4e2de1db0e6893dc0cc031a181ce52a</Sha>
</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-alpha.1.24605.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="10.0.0-alpha.1.24617.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/winforms</Uri>
<Sha>6ecb29a0b34c73048062257c1cab74b219759260</Sha>
<Sha>d195a5f10338c2f15433f01e3dbfbdb2b10ba2a3</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="10.0.0-alpha.1.24605.3" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="10.0.0-alpha.1.24619.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/wpf</Uri>
<Sha>c6bff274b42ea186c4a53aab6e6447cf92aeb1e1</Sha>
<Sha>6cdf5bc75531e8f277c5a622fd87a9c291a15f22</Sha>
</Dependency>
<Dependency Name="Microsoft.Web.Xdt" Version="10.0.0-preview.24609.2">
<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-alpha.1.24605.2</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>10.0.0-alpha.1.24617.1</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/runtime -->
Expand Down Expand Up @@ -136,9 +136,9 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
<VSRedistCommonWindowsDesktopSharedFrameworkx64100PackageVersion>10.0.0-alpha.1.24607.1</VSRedistCommonWindowsDesktopSharedFrameworkx64100PackageVersion>
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>10.0.0-alpha.1.24607.1</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
<MicrosoftWindowsDesktopAppRefPackageVersion>10.0.0-alpha.1.24607.1</MicrosoftWindowsDesktopAppRefPackageVersion>
<VSRedistCommonWindowsDesktopSharedFrameworkx64100PackageVersion>10.0.0-alpha.1.24622.1</VSRedistCommonWindowsDesktopSharedFrameworkx64100PackageVersion>
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>10.0.0-alpha.1.24622.1</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
<MicrosoftWindowsDesktopAppRefPackageVersion>10.0.0-alpha.1.24622.1</MicrosoftWindowsDesktopAppRefPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/nuget/nuget.client -->
Expand Down Expand Up @@ -242,8 +242,8 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/wpf -->
<MicrosoftNETSdkWindowsDesktopPackageVersion>10.0.0-alpha.1.24605.3</MicrosoftNETSdkWindowsDesktopPackageVersion>
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>10.0.0-alpha.1.24605.3</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
<MicrosoftNETSdkWindowsDesktopPackageVersion>10.0.0-alpha.1.24619.1</MicrosoftNETSdkWindowsDesktopPackageVersion>
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>10.0.0-alpha.1.24619.1</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
</PropertyGroup>
<PropertyGroup Label="Template versions">
<!-- 10.0 Template versions -->
Expand Down
2 changes: 1 addition & 1 deletion src/Installer/redist-installer/targets/Crossgen.targets
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
<BlazorWasmTools>$(SdkOutputDirectory)Sdks\Microsoft.NET.Sdk.BlazorWebAssembly\tools\$(DefaultToolTfm)\</BlazorWasmTools>
<NuGetPackTools>$(SdkOutputDirectory)Sdks\NuGet.Build.Tasks.Pack\CoreCLR\</NuGetPackTools>
<RazorTasks>$(SdkOutputDirectory)Sdks\Microsoft.NET.Sdk.Razor\tasks\$(DefaultToolTfm)\</RazorTasks>
<WindowsDesktopTools>$(SdkOutputDirectory)Sdks\Microsoft.NET.Sdk.WindowsDesktop\tools\net9.0\</WindowsDesktopTools>
<WindowsDesktopTools>$(SdkOutputDirectory)Sdks\Microsoft.NET.Sdk.WindowsDesktop\tools\$(DefaultToolTfm)\</WindowsDesktopTools>
<PublishTools>$(SdkOutputDirectory)Sdks\Microsoft.NET.Sdk.Publish\tools\$(DefaultToolTfm)\</PublishTools>
<WebTools>$(SdkOutputDirectory)Sdks\Microsoft.NET.Sdk.Web\tools\$(DefaultToolTfm)\</WebTools>
<ProjectSystemTools>$(SdkOutputDirectory)Sdks\Microsoft.NET.Sdk.Web.ProjectSystem\tools\$(DefaultToolTfm)\</ProjectSystemTools>
Expand Down
23 changes: 0 additions & 23 deletions src/SourceBuild/patches/wpf/0001-condition-winforms-private-package-tfm.patch
View file

This file was deleted.

0 comments on commit 0d646c2

Please sign in to comment.