Skip to content
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

[main] Update dependencies from dotnet/windowsdesktop #44650

Merged
merged 3 commits into from
Nov 6, 2024
Merged

[main] Update dependencies from dotnet/windowsdesktop #44650

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f4b35e8
Update dependencies from https://github.com/dotnet/windowsdesktop bui…
dotnet-maestro[bot] Nov 5, 2024
4062a1f
Delete src/SourceBuild/patches/windowsdesktop/0001-Update-SDK-and-rem…
ViktorHofer Nov 5, 2024
26960be
Merge branch 'main' of https://github.com/dotnet/sdk into darc-main-2…
v-wuzhai Nov 6, 2024
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
16 changes: 8 additions & 8 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,22 +260,22 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>c4d7f7c6f2e2f34f07e64c6caa3bf9b2ce915cc1</Sha>
</Dependency>
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="10.0.0-alpha.1.24554.1">
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="10.0.0-alpha.1.24555.1">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
<Sha>6be1aecc178386c490f71dc4b417717882c09f57</Sha>
<Sha>138cc3ba1a40bd175c576a6b85abc1b2e352545e</Sha>
<SourceBuildTarball RepoName="windowsdesktop" ManagedOnly="true" />
</Dependency>
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.10.0" Version="10.0.0-alpha.1.24554.1">
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.10.0" Version="10.0.0-alpha.1.24555.1">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
<Sha>6be1aecc178386c490f71dc4b417717882c09f57</Sha>
<Sha>138cc3ba1a40bd175c576a6b85abc1b2e352545e</Sha>
</Dependency>
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="10.0.0-alpha.1.24554.1">
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="10.0.0-alpha.1.24555.1">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
<Sha>6be1aecc178386c490f71dc4b417717882c09f57</Sha>
<Sha>138cc3ba1a40bd175c576a6b85abc1b2e352545e</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.10.0" Version="10.0.0-alpha.1.24554.1">
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.10.0" Version="10.0.0-alpha.1.24555.1">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
<Sha>6be1aecc178386c490f71dc4b417717882c09f57</Sha>
<Sha>138cc3ba1a40bd175c576a6b85abc1b2e352545e</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="10.0.0-alpha.1.24553.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref">
<Uri>https://github.com/dotnet/wpf</Uri>
Expand Down
6 changes: 3 additions & 3 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,9 +157,9 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
<VSRedistCommonWindowsDesktopSharedFrameworkx64100PackageVersion>10.0.0-alpha.1.24554.1</VSRedistCommonWindowsDesktopSharedFrameworkx64100PackageVersion>
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>10.0.0-alpha.1.24554.1</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
<MicrosoftWindowsDesktopAppRefPackageVersion>10.0.0-alpha.1.24554.1</MicrosoftWindowsDesktopAppRefPackageVersion>
<VSRedistCommonWindowsDesktopSharedFrameworkx64100PackageVersion>10.0.0-alpha.1.24555.1</VSRedistCommonWindowsDesktopSharedFrameworkx64100PackageVersion>
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>10.0.0-alpha.1.24555.1</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
<MicrosoftWindowsDesktopAppRefPackageVersion>10.0.0-alpha.1.24555.1</MicrosoftWindowsDesktopAppRefPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/nuget/nuget.client -->
Expand Down
89 changes: 0 additions & 89 deletions src/SourceBuild/patches/windowsdesktop/0001-Update-SDK-and-remove-net10-workaround.patch
View file
Open in desktop

This file was deleted.