Skip to content

Commit

Permalink
[Recursive sync] sdk / e700c6e → 7b90c7f
Browse files Browse the repository at this point in the history
  • Loading branch information
dotnet-maestro[bot] committed Jan 10, 2025
1 parent 7070356 commit 4e624eb
Show file tree
Hide file tree
Showing 37 changed files with 993 additions and 767 deletions.
2 changes: 1 addition & 1 deletion prereqs/git-info/sdk.props
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project>
<PropertyGroup>
<GitCommitHash>e700c6e181b53dc9a365aa96ca32dacf699d835c</GitCommitHash>
<GitCommitHash>7b90c7fc92d91e0600d298f654e4b82081f69cdd</GitCommitHash>
<OfficialBuildId>20250110.1</OfficialBuildId>
<OutputPackageVersion>0.0.0</OutputPackageVersion>
</PropertyGroup>
Expand Down
6 changes: 3 additions & 3 deletions prereqs/git-info/windowsdesktop.props
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<Project>
<PropertyGroup>
<GitCommitHash>482e721f784460a0c6464bbf9b7306edb2ee3791</GitCommitHash>
<OfficialBuildId>20250108.1</OfficialBuildId>
<OutputPackageVersion>10.0.0-alpha.1.25058.1</OutputPackageVersion>
<GitCommitHash>5ab6ad62c1cfb74bc02313d4e402b224440be94c</GitCommitHash>
<OfficialBuildId>20250109.1</OfficialBuildId>
<OutputPackageVersion>10.0.0-alpha.1.25059.1</OutputPackageVersion>
</PropertyGroup>
</Project>
6 changes: 3 additions & 3 deletions prereqs/git-info/winforms.props
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<Project>
<PropertyGroup>
<GitCommitHash>a3da2c91433c32b8ed267fe660af6581cdbe1da0</GitCommitHash>
<OfficialBuildId>20250107.7</OfficialBuildId>
<OutputPackageVersion>10.0.0-alpha.1.25057.7</OutputPackageVersion>
<GitCommitHash>ce6b6c2e675edbb52900ca75f66603d2468c5034</GitCommitHash>
<OfficialBuildId>20250108.9</OfficialBuildId>
<OutputPackageVersion>10.0.0-alpha.1.25058.9</OutputPackageVersion>
</PropertyGroup>
</Project>
6 changes: 3 additions & 3 deletions prereqs/git-info/wpf.props
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<Project>
<PropertyGroup>
<GitCommitHash>538cc805308fb006f5f793a0f299609d3007b612</GitCommitHash>
<OfficialBuildId>20250108.2</OfficialBuildId>
<OutputPackageVersion>10.0.0-alpha.1.25058.2</OutputPackageVersion>
<GitCommitHash>13ba88319d24dc9bdef6e4d18361d2153c8a4fe8</GitCommitHash>
<OfficialBuildId>20250108.3</OfficialBuildId>
<OutputPackageVersion>10.0.0-alpha.1.25058.3</OutputPackageVersion>
</PropertyGroup>
</Project>
28 changes: 14 additions & 14 deletions src/sdk/eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -254,26 +254,26 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>45155059d0b070e8ac0f6ad8f4909448e7eadd42</Sha>
</Dependency>
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="10.0.0-alpha.1.25058.1">
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="10.0.0-alpha.1.25059.1">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
<Sha>482e721f784460a0c6464bbf9b7306edb2ee3791</Sha>
<Sha>5ab6ad62c1cfb74bc02313d4e402b224440be94c</Sha>
<SourceBuildTarball RepoName="windowsdesktop" ManagedOnly="true" />
</Dependency>
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.10.0" Version="10.0.0-alpha.1.25058.1">
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.10.0" Version="10.0.0-alpha.1.25059.1">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
<Sha>482e721f784460a0c6464bbf9b7306edb2ee3791</Sha>
<Sha>5ab6ad62c1cfb74bc02313d4e402b224440be94c</Sha>
</Dependency>
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="10.0.0-alpha.1.25058.1">
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="10.0.0-alpha.1.25059.1">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
<Sha>482e721f784460a0c6464bbf9b7306edb2ee3791</Sha>
<Sha>5ab6ad62c1cfb74bc02313d4e402b224440be94c</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.10.0" Version="10.0.0-alpha.1.25058.1">
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.10.0" Version="10.0.0-alpha.1.25059.1">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
<Sha>482e721f784460a0c6464bbf9b7306edb2ee3791</Sha>
<Sha>5ab6ad62c1cfb74bc02313d4e402b224440be94c</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="10.0.0-alpha.1.25058.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref">
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="10.0.0-alpha.1.25058.3" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref">
<Uri>https://github.com/dotnet/wpf</Uri>
<Sha>538cc805308fb006f5f793a0f299609d3007b612</Sha>
<Sha>13ba88319d24dc9bdef6e4d18361d2153c8a4fe8</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="10.0.0-alpha.2.25058.2">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
Expand Down Expand Up @@ -360,13 +360,13 @@
<Sha>77b91e15c1403acd793322b7163469ad7d8babf9</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.25057.7" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="10.0.0-alpha.1.25058.9" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/winforms</Uri>
<Sha>a3da2c91433c32b8ed267fe660af6581cdbe1da0</Sha>
<Sha>ce6b6c2e675edbb52900ca75f66603d2468c5034</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="10.0.0-alpha.1.25058.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="10.0.0-alpha.1.25058.3" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/wpf</Uri>
<Sha>538cc805308fb006f5f793a0f299609d3007b612</Sha>
<Sha>13ba88319d24dc9bdef6e4d18361d2153c8a4fe8</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 src/sdk/eng/Versions.props
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.25057.7</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>10.0.0-alpha.1.25058.9</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.25058.1</VSRedistCommonWindowsDesktopSharedFrameworkx64100PackageVersion>
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>10.0.0-alpha.1.25058.1</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
<MicrosoftWindowsDesktopAppRefPackageVersion>10.0.0-alpha.1.25058.1</MicrosoftWindowsDesktopAppRefPackageVersion>
<VSRedistCommonWindowsDesktopSharedFrameworkx64100PackageVersion>10.0.0-alpha.1.25059.1</VSRedistCommonWindowsDesktopSharedFrameworkx64100PackageVersion>
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>10.0.0-alpha.1.25059.1</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
<MicrosoftWindowsDesktopAppRefPackageVersion>10.0.0-alpha.1.25059.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.25058.2</MicrosoftNETSdkWindowsDesktopPackageVersion>
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>10.0.0-alpha.1.25058.2</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
<MicrosoftNETSdkWindowsDesktopPackageVersion>10.0.0-alpha.1.25058.3</MicrosoftNETSdkWindowsDesktopPackageVersion>
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>10.0.0-alpha.1.25058.3</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
</PropertyGroup>
<PropertyGroup Label="Template versions">
<!-- 10.0 Template versions -->
Expand Down
14 changes: 7 additions & 7 deletions src/source-manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@
"barId": null,
"path": "sdk",
"remoteUri": "https://github.com/dotnet/sdk",
"commitSha": "e700c6e181b53dc9a365aa96ca32dacf699d835c"
"commitSha": "7b90c7fc92d91e0600d298f654e4b82081f69cdd"
},
{
"packageVersion": "10.0.605604",
Expand Down Expand Up @@ -169,25 +169,25 @@
"commitSha": "69c2d3e61a2baf76e1491727e81c4d9b344e4d91"
},
{
"packageVersion": "10.0.0-alpha.1.25058.1",
"packageVersion": "10.0.0-alpha.1.25059.1",
"barId": null,
"path": "windowsdesktop",
"remoteUri": "https://github.com/dotnet/windowsdesktop",
"commitSha": "482e721f784460a0c6464bbf9b7306edb2ee3791"
"commitSha": "5ab6ad62c1cfb74bc02313d4e402b224440be94c"
},
{
"packageVersion": "10.0.0-alpha.1.25057.7",
"packageVersion": "10.0.0-alpha.1.25058.9",
"barId": null,
"path": "winforms",
"remoteUri": "https://github.com/dotnet/winforms",
"commitSha": "a3da2c91433c32b8ed267fe660af6581cdbe1da0"
"commitSha": "ce6b6c2e675edbb52900ca75f66603d2468c5034"
},
{
"packageVersion": "10.0.0-alpha.1.25058.2",
"packageVersion": "10.0.0-alpha.1.25058.3",
"barId": null,
"path": "wpf",
"remoteUri": "https://github.com/dotnet/wpf",
"commitSha": "538cc805308fb006f5f793a0f299609d3007b612"
"commitSha": "13ba88319d24dc9bdef6e4d18361d2153c8a4fe8"
},
{
"packageVersion": "10.0.0-preview.24609.2",
Expand Down
Loading

0 comments on commit 4e624eb

Please sign in to comment.