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.

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 #43239

Merged
merged 58 commits into from
Oct 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
6e56c83
Update dependencies from https://github.com/dotnet/windowsdesktop bui…
dotnet-maestro[bot] Sep 5, 2024
5ef7d24
Update dependencies from https://github.com/dotnet/windowsdesktop bui…
dotnet-maestro[bot] Sep 5, 2024
dff2577
Update dependencies from https://github.com/dotnet/windowsdesktop bui…
dotnet-maestro[bot] Sep 6, 2024
754fbcf
Update dependencies from https://github.com/dotnet/windowsdesktop bui…
dotnet-maestro[bot] Sep 6, 2024
1ff3bf1
Merge branch 'main' into darc-main-e62535b3-4f5d-4d98-92a7-cf37c26fee22
MiYanni Sep 6, 2024
d1d32ca
Update dependencies from https://github.com/dotnet/windowsdesktop bui…
dotnet-maestro[bot] Sep 7, 2024
b2703ab
Update dependencies from https://github.com/dotnet/windowsdesktop bui…
dotnet-maestro[bot] Sep 8, 2024
9af3b19
Update dependencies from https://github.com/dotnet/windowsdesktop bui…
dotnet-maestro[bot] Sep 8, 2024
78b940c
Merge branch 'main' of https://github.com/dotnet/sdk into darc-main-e…
v-wuzhai Sep 9, 2024
54210b2
Update dependencies from https://github.com/dotnet/windowsdesktop bui…
dotnet-maestro[bot] Sep 9, 2024
575aa98
Merge branch 'main' of https://github.com/dotnet/sdk into darc-main-e…
v-wuzhai Sep 12, 2024
236cd57
Update dependencies from https://github.com/dotnet/windowsdesktop bui…
dotnet-maestro[bot] Sep 12, 2024
bb17d60
Update dependencies from https://github.com/dotnet/windowsdesktop bui…
dotnet-maestro[bot] Sep 12, 2024
4f8f63c
Update dependencies from https://github.com/dotnet/windowsdesktop bui…
dotnet-maestro[bot] Sep 13, 2024
deb8187
Update dependencies from https://github.com/dotnet/windowsdesktop bui…
dotnet-maestro[bot] Sep 13, 2024
66e89f6
Update dependencies from https://github.com/dotnet/windowsdesktop bui…
dotnet-maestro[bot] Sep 13, 2024
a451fe3
Update dependencies from https://github.com/dotnet/windowsdesktop bui…
dotnet-maestro[bot] Sep 14, 2024
1f12a43
Update dependencies from https://github.com/dotnet/windowsdesktop bui…
dotnet-maestro[bot] Sep 17, 2024
34c4b03
Update dependencies from https://github.com/dotnet/windowsdesktop bui…
dotnet-maestro[bot] Sep 17, 2024
776a62a
Update dependencies from https://github.com/dotnet/windowsdesktop bui…
dotnet-maestro[bot] Sep 17, 2024
40c1a0d
Update dependencies from https://github.com/dotnet/windowsdesktop bui…
dotnet-maestro[bot] Sep 18, 2024
5ed5e8d
Update dependencies from https://github.com/dotnet/windowsdesktop bui…
dotnet-maestro[bot] Sep 18, 2024
d0eaa89
Update dependencies from https://github.com/dotnet/windowsdesktop bui…
dotnet-maestro[bot] Sep 18, 2024
e50a67a
Update dependencies from https://github.com/dotnet/windowsdesktop bui…
dotnet-maestro[bot] Sep 19, 2024
b4d5995
Update dependencies from https://github.com/dotnet/windowsdesktop bui…
dotnet-maestro[bot] Sep 19, 2024
8eb04b8
Merge branch 'main' of https://github.com/dotnet/sdk into darc-main-e…
v-wuzhai Sep 20, 2024
ddc01fb
Update dependencies from https://github.com/dotnet/windowsdesktop bui…
dotnet-maestro[bot] Sep 23, 2024
a15ea8c
Update dependencies from https://github.com/dotnet/windowsdesktop bui…
dotnet-maestro[bot] Sep 24, 2024
74e48c9
Update dependencies from https://github.com/dotnet/windowsdesktop bui…
dotnet-maestro[bot] Sep 24, 2024
c4d8243
Update dependencies from https://github.com/dotnet/windowsdesktop bui…
dotnet-maestro[bot] Sep 24, 2024
2e4910c
Update dependencies from https://github.com/dotnet/windowsdesktop bui…
dotnet-maestro[bot] Sep 25, 2024
c4c14b5
Update dependencies from https://github.com/dotnet/windowsdesktop bui…
dotnet-maestro[bot] Sep 25, 2024
922537c
Update dependencies from https://github.com/dotnet/windowsdesktop bui…
dotnet-maestro[bot] Sep 25, 2024
8ac3d12
Update dependencies from https://github.com/dotnet/windowsdesktop bui…
dotnet-maestro[bot] Sep 26, 2024
414232e
Update dependencies from https://github.com/dotnet/windowsdesktop bui…
dotnet-maestro[bot] Sep 27, 2024
85c8b0a
Update dependencies from https://github.com/dotnet/windowsdesktop bui…
dotnet-maestro[bot] Sep 27, 2024
38e943f
Update dependencies from https://github.com/dotnet/windowsdesktop bui…
dotnet-maestro[bot] Sep 27, 2024
f0a0c4b
Update dependencies from https://github.com/dotnet/windowsdesktop bui…
dotnet-maestro[bot] Oct 1, 2024
fb3c807
Merge branch 'main' into darc-main-e62535b3-4f5d-4d98-92a7-cf37c26fee22
nagilson Oct 1, 2024
1232320
Update dependencies from https://github.com/dotnet/windowsdesktop bui…
dotnet-maestro[bot] Oct 2, 2024
f23be2d
Update dependencies from https://github.com/dotnet/windowsdesktop bui…
dotnet-maestro[bot] Oct 2, 2024
1c623da
Update dependencies from https://github.com/dotnet/windowsdesktop bui…
dotnet-maestro[bot] Oct 3, 2024
5f574e2
Update dependencies from https://github.com/dotnet/windowsdesktop bui…
dotnet-maestro[bot] Oct 4, 2024
c28d4d4
Update dependencies from https://github.com/dotnet/windowsdesktop bui…
dotnet-maestro[bot] Oct 4, 2024
6117226
Update dependencies from https://github.com/dotnet/windowsdesktop bui…
dotnet-maestro[bot] Oct 5, 2024
65e18f8
Merge remote-tracking branch 'origin/main' into darc-main-e62535b3-4f…
nagilson Oct 7, 2024
0478e17
Merge branch 'main' into darc-main-e62535b3-4f5d-4d98-92a7-cf37c26fee22
nagilson Oct 7, 2024
91aa644
Update dependencies from https://github.com/dotnet/windowsdesktop bui…
dotnet-maestro[bot] Oct 8, 2024
b26f3e6
Merge branch 'main' into darc-main-e62535b3-4f5d-4d98-92a7-cf37c26fee22
nagilson Oct 8, 2024
3078143
Update dependencies from https://github.com/dotnet/windowsdesktop bui…
dotnet-maestro[bot] Oct 9, 2024
a07fe4c
Update dependencies from https://github.com/dotnet/windowsdesktop bui…
dotnet-maestro[bot] Oct 9, 2024
6086605
Update dependencies from https://github.com/dotnet/windowsdesktop bui…
dotnet-maestro[bot] Oct 10, 2024
7a105c3
Update dependencies from https://github.com/dotnet/windowsdesktop bui…
dotnet-maestro[bot] Oct 11, 2024
ff2f81a
Update dependencies from https://github.com/dotnet/windowsdesktop bui…
dotnet-maestro[bot] Oct 11, 2024
6dad174
Update dependencies from https://github.com/dotnet/windowsdesktop bui…
dotnet-maestro[bot] Oct 11, 2024
f65bd4d
Merge branch 'main' into darc-main-e62535b3-4f5d-4d98-92a7-cf37c26fee22
nagilson Oct 11, 2024
321aa18
Merge branch 'main' into darc-main-e62535b3-4f5d-4d98-92a7-cf37c26fee22
NikolaMilosavljevic Oct 11, 2024
b75f54c
Merge branch 'main' into darc-main-e62535b3-4f5d-4d98-92a7-cf37c26fee22
NikolaMilosavljevic Oct 11, 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
28 changes: 14 additions & 14 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -260,26 +260,26 @@
<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.24501.1">
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="10.0.0-alpha.1.24511.4">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
<Sha>74b22bc19ff2bdf01ce13ef4e33f5b106b2e31dc</Sha>
<Sha>baca474cfafd0ba6d509de8de6761c0ab38f523f</Sha>
<SourceBuildTarball RepoName="windowsdesktop" ManagedOnly="true" />
</Dependency>
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.10.0" Version="10.0.0-alpha.1.24501.1">
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.10.0" Version="10.0.0-alpha.1.24511.4">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
<Sha>74b22bc19ff2bdf01ce13ef4e33f5b106b2e31dc</Sha>
<Sha>baca474cfafd0ba6d509de8de6761c0ab38f523f</Sha>
</Dependency>
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="10.0.0-alpha.1.24501.1">
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="10.0.0-alpha.1.24511.4">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
<Sha>74b22bc19ff2bdf01ce13ef4e33f5b106b2e31dc</Sha>
<Sha>baca474cfafd0ba6d509de8de6761c0ab38f523f</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.10.0" Version="10.0.0-alpha.1.24501.1">
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.10.0" Version="10.0.0-alpha.1.24511.4">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
<Sha>74b22bc19ff2bdf01ce13ef4e33f5b106b2e31dc</Sha>
<Sha>baca474cfafd0ba6d509de8de6761c0ab38f523f</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="10.0.0-alpha.1.24480.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref">
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="10.0.0-alpha.1.24511.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref">
<Uri>https://github.com/dotnet/wpf</Uri>
<Sha>ce09c88c666057407b355ea86e1ad8713ac674a1</Sha>
<Sha>934a82731d7c35d639f221fa818a26ab4518425e</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="10.0.0-alpha.2.24510.5">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
Expand Down Expand Up @@ -396,13 +396,13 @@
<SourceBuild RepoName="test-templates" 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-alpha.1.24478.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="10.0.0-alpha.1.24510.7" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/winforms</Uri>
<Sha>ff838ac7ac134944d5519c3eedf7e689b2d9f2e5</Sha>
<Sha>cf5e72103a11b330055832fb29f16d66666c3154</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="10.0.0-alpha.1.24480.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="10.0.0-alpha.1.24511.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/wpf</Uri>
<Sha>ce09c88c666057407b355ea86e1ad8713ac674a1</Sha>
<Sha>934a82731d7c35d639f221fa818a26ab4518425e</Sha>
</Dependency>
<Dependency Name="Microsoft.Web.Xdt" Version="9.0.0-preview.24476.1">
<Uri>https://github.com/dotnet/xdt</Uri>
Expand Down
12 changes: 6 additions & 6 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/winforms -->
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>10.0.0-alpha.1.24478.1</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>10.0.0-alpha.1.24510.7</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/test-templates -->
Expand Down Expand Up @@ -174,9 +174,9 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
<VSRedistCommonWindowsDesktopSharedFrameworkx64100PackageVersion>10.0.0-alpha.1.24501.1</VSRedistCommonWindowsDesktopSharedFrameworkx64100PackageVersion>
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>10.0.0-alpha.1.24501.1</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
<MicrosoftWindowsDesktopAppRefPackageVersion>10.0.0-alpha.1.24501.1</MicrosoftWindowsDesktopAppRefPackageVersion>
<VSRedistCommonWindowsDesktopSharedFrameworkx64100PackageVersion>10.0.0-alpha.1.24511.4</VSRedistCommonWindowsDesktopSharedFrameworkx64100PackageVersion>
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>10.0.0-alpha.1.24511.4</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
<MicrosoftWindowsDesktopAppRefPackageVersion>10.0.0-alpha.1.24511.4</MicrosoftWindowsDesktopAppRefPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/nuget/nuget.client -->
Expand Down Expand Up @@ -275,8 +275,8 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/wpf -->
<MicrosoftNETSdkWindowsDesktopPackageVersion>10.0.0-alpha.1.24480.1</MicrosoftNETSdkWindowsDesktopPackageVersion>
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>10.0.0-alpha.1.24480.1</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
<MicrosoftNETSdkWindowsDesktopPackageVersion>10.0.0-alpha.1.24511.1</MicrosoftNETSdkWindowsDesktopPackageVersion>
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>10.0.0-alpha.1.24511.1</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
</PropertyGroup>
<PropertyGroup Label="Runtime and Apphost aliases">
<!-- Runtime and Apphost pack versions are the same for all RIDs. We flow the x64 version above and create aliases without the winx64 here for clarity elsewhere. -->
Expand Down