Skip to content

Commit b2e30b8

Browse files
dotnet-maestro[bot]ViktorHofer
dotnet-maestro[bot]
and
ViktorHofer
authored
[release/10.0.1xx-preview2] Update dependencies from dotnet/windowsdesktop (#47078)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Viktor Hofer <[email protected]>
1 parent aa5c40b commit b2e30b8

File tree

3 files changed

+20
-132
lines changed

3 files changed

+20
-132
lines changed

‎eng/Version.Details.xml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -278,26 +278,26 @@
278278
<Uri>https://github.com/dotnet/runtime</Uri>
279279
<Sha>8ed081e7ddc399c9d240ba4546002bdbb4e2330c</Sha>
280280
</Dependency>
281-
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="10.0.0-preview.2.25117.1">
281+
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="10.0.0-preview.2.25124.2">
282282
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
283-
<Sha>4b4041a88d06cced3b23358f44eccc27ce290aa4</Sha>
283+
<Sha>c394981206d611976c620e727632baa8c75b038c</Sha>
284284
<SourceBuildTarball RepoName="windowsdesktop" ManagedOnly="true" />
285285
</Dependency>
286-
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.10.0" Version="10.0.0-preview.2.25117.1">
286+
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.10.0" Version="10.0.0-preview.2.25124.2">
287287
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
288-
<Sha>4b4041a88d06cced3b23358f44eccc27ce290aa4</Sha>
288+
<Sha>c394981206d611976c620e727632baa8c75b038c</Sha>
289289
</Dependency>
290-
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="10.0.0-preview.2.25117.1">
290+
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="10.0.0-preview.2.25124.2">
291291
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
292-
<Sha>4b4041a88d06cced3b23358f44eccc27ce290aa4</Sha>
292+
<Sha>c394981206d611976c620e727632baa8c75b038c</Sha>
293293
</Dependency>
294-
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.10.0" Version="10.0.0-preview.2.25117.1">
294+
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.10.0" Version="10.0.0-preview.2.25124.2">
295295
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
296-
<Sha>4b4041a88d06cced3b23358f44eccc27ce290aa4</Sha>
296+
<Sha>c394981206d611976c620e727632baa8c75b038c</Sha>
297297
</Dependency>
298-
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="10.0.0-preview.2.25117.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref">
298+
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="10.0.0-preview.2.25124.5" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref">
299299
<Uri>https://github.com/dotnet/wpf</Uri>
300-
<Sha>fb7cf69e315f2277670dc991937da23c8e129be8</Sha>
300+
<Sha>224237222e4b3991d12e5c3c54f808c85e3ebd86</Sha>
301301
</Dependency>
302302
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="10.0.0-preview.2.25124.13">
303303
<Uri>https://github.com/dotnet/aspnetcore</Uri>
@@ -445,13 +445,13 @@
445445
<SourceBuild RepoName="razor" ManagedOnly="true" />
446446
</Dependency>
447447
<!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop -->
448-
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="10.0.0-preview.2.25114.7" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
448+
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="10.0.0-preview.2.25121.9" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
449449
<Uri>https://github.com/dotnet/winforms</Uri>
450-
<Sha>8ef1b9ce8c7d6c6cddad427c3b2027dc2232d395</Sha>
450+
<Sha>1114c91f25ecfb83234dc8f04751cea949cc4f50</Sha>
451451
</Dependency>
452-
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="10.0.0-preview.2.25117.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
452+
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="10.0.0-preview.2.25124.5" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
453453
<Uri>https://github.com/dotnet/wpf</Uri>
454-
<Sha>fb7cf69e315f2277670dc991937da23c8e129be8</Sha>
454+
<Sha>224237222e4b3991d12e5c3c54f808c85e3ebd86</Sha>
455455
</Dependency>
456456
<Dependency Name="Microsoft.Web.Xdt" Version="10.0.0-preview.25067.1">
457457
<Uri>https://github.com/dotnet/xdt</Uri>

‎eng/Versions.props

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
</PropertyGroup>
8484
<PropertyGroup>
8585
<!-- Dependency from https://github.com/dotnet/winforms -->
86-
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>10.0.0-preview.2.25114.7</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
86+
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>10.0.0-preview.2.25121.9</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
8787
</PropertyGroup>
8888
<PropertyGroup>
8989
<!-- Dependencies from https://github.com/dotnet/runtime -->
@@ -140,9 +140,9 @@
140140
</PropertyGroup>
141141
<PropertyGroup>
142142
<!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
143-
<VSRedistCommonWindowsDesktopSharedFrameworkx64100PackageVersion>10.0.0-preview.2.25117.1</VSRedistCommonWindowsDesktopSharedFrameworkx64100PackageVersion>
144-
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>10.0.0-preview.2.25117.1</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
145-
<MicrosoftWindowsDesktopAppRefPackageVersion>10.0.0-preview.2.25117.1</MicrosoftWindowsDesktopAppRefPackageVersion>
143+
<VSRedistCommonWindowsDesktopSharedFrameworkx64100PackageVersion>10.0.0-preview.2.25124.2</VSRedistCommonWindowsDesktopSharedFrameworkx64100PackageVersion>
144+
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>10.0.0-preview.2.25124.2</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
145+
<MicrosoftWindowsDesktopAppRefPackageVersion>10.0.0-preview.2.25124.2</MicrosoftWindowsDesktopAppRefPackageVersion>
146146
</PropertyGroup>
147147
<PropertyGroup>
148148
<!-- Dependencies from https://github.com/nuget/nuget.client -->
@@ -253,8 +253,8 @@
253253
</PropertyGroup>
254254
<PropertyGroup>
255255
<!-- Dependencies from https://github.com/dotnet/wpf -->
256-
<MicrosoftNETSdkWindowsDesktopPackageVersion>10.0.0-preview.2.25117.1</MicrosoftNETSdkWindowsDesktopPackageVersion>
257-
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>10.0.0-preview.2.25117.1</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
256+
<MicrosoftNETSdkWindowsDesktopPackageVersion>10.0.0-preview.2.25124.5</MicrosoftNETSdkWindowsDesktopPackageVersion>
257+
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>10.0.0-preview.2.25124.5</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
258258
</PropertyGroup>
259259
<PropertyGroup Label="Infrastructure and test only dependencies">
260260
<VersionToolsVersion>2.2.0-beta.19072.10</VersionToolsVersion>

‎src/SourceBuild/patches/winforms/0002-Fix-nuget-package-pruning-warnings-in-tests.patch

Lines changed: 0 additions & 112 deletions
This file was deleted.

0 commit comments

Comments
 (0)