Skip to content

Eliminate windowsdesktop, wpf, and winforms version elements #49722

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

Merged
merged 5 commits into from
Jul 11, 2025
Merged

Eliminate windowsdesktop, wpf, and winforms version elements #49722

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8e339a2
Eliminate windowsdesktop, wpf, and winforms version elements
mmitche Jul 9, 2025
3582717
Update src/Layout/redist/targets/GenerateBundledVersions.targets
mmitche Jul 10, 2025
b1bdc61
Update src/Layout/redist/targets/GenerateBundledVersions.targets
mmitche Jul 10, 2025
dfc584c
Merge branch 'main' into eliminate-windows-versions
mmitche Jul 10, 2025
8432e20
Update src/Layout/redist/targets/GenerateBundledVersions.targets
mmitche Jul 10, 2025
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
8 changes: 7 additions & 1 deletion Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,13 @@
<MicrosoftNETCoreAppHostPackageVersion>$(MicrosoftNETCoreAppRefPackageVersion)</MicrosoftNETCoreAppHostPackageVersion>
<MicrosoftNETCoreAppRuntimePackageVersion>$(MicrosoftNETCoreAppRefPackageVersion)</MicrosoftNETCoreAppRuntimePackageVersion>
<MicrosoftAspNetCoreAppRuntimePackageVersion>$(MicrosoftAspNetCoreAppRefPackageVersion)</MicrosoftAspNetCoreAppRuntimePackageVersion>
<MicrosoftWindowsDesktopAppRuntimePackageVersion>$(MicrosoftWindowsDesktopAppRefPackageVersion)</MicrosoftWindowsDesktopAppRuntimePackageVersion>
<!-- These are set based on the runtime shared framework and internal versions. This is because windowsdesktop is not built in
all VMR builds, but its version numbers are used to generate various bits of information. The VMR always aligns the version
numbers of the shared frameworks. -->
<MicrosoftWindowsDesktopAppRuntimePackageVersion>$(MicrosoftNETCoreAppRefPackageVersion)</MicrosoftWindowsDesktopAppRuntimePackageVersion>
<MicrosoftWindowsDesktopAppRefPackageVersion>$(MicrosoftNETCoreAppRefPackageVersion)</MicrosoftWindowsDesktopAppRefPackageVersion>
<MicrosoftNETSdkWindowsDesktopPackageVersion>$(MicrosoftNETCorePlatformsPackageVersion)</MicrosoftNETSdkWindowsDesktopPackageVersion>
<MicrosoftWindowsDesktopAppInternalPackageVersion>$(MicrosoftNETCorePlatformsPackageVersion)</MicrosoftWindowsDesktopAppInternalPackageVersion>

<HostFxrVersion>$(MicrosoftNETCoreAppRuntimePackageVersion)</HostFxrVersion>
<SharedHostVersion>$(MicrosoftNETCoreAppRuntimePackageVersion)</SharedHostVersion>
Expand Down
21 changes: 0 additions & 21 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,18 +225,6 @@
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>f451e5d3036a4f140a989e0a7f3f1ae432420e71</Sha>
</Dependency>
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="10.0.0-preview.7.25359.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>f451e5d3036a4f140a989e0a7f3f1ae432420e71</Sha>
</Dependency>
<Dependency Name="Microsoft.WindowsDesktop.App.Internal" Version="10.0.0-preview.7.25359.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>f451e5d3036a4f140a989e0a7f3f1ae432420e71</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="10.0.0-preview.7.25359.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>f451e5d3036a4f140a989e0a7f3f1ae432420e71</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="10.0.0-preview.7.25359.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>f451e5d3036a4f140a989e0a7f3f1ae432420e71</Sha>
Expand Down Expand Up @@ -362,15 +350,6 @@
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>f451e5d3036a4f140a989e0a7f3f1ae432420e71</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-preview.7.25359.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>f451e5d3036a4f140a989e0a7f3f1ae432420e71</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="10.0.0-preview.7.25359.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>f451e5d3036a4f140a989e0a7f3f1ae432420e71</Sha>
</Dependency>
<Dependency Name="Microsoft.Web.Xdt" Version="3.2.0-preview.25359.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>f451e5d3036a4f140a989e0a7f3f1ae432420e71</Sha>
Expand Down
16 changes: 0 additions & 16 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,10 +95,6 @@
<!-- Dependency from https://github.com/dotnet/aspire -->
<AspirePackageVersion>9.1.0-preview.1.24555.3</AspirePackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/winforms -->
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>10.0.0-preview.7.25359.101</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/runtime -->
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-preview.7.25359.101</MicrosoftNETCoreAppRefPackageVersion>
Expand Down Expand Up @@ -148,11 +144,6 @@
<SystemThreadingTasksExtensionsToolsetPackageVersion>4.5.4</SystemThreadingTasksExtensionsToolsetPackageVersion>
<SystemResourcesExtensionsToolsetPackageVersion>8.0.0</SystemResourcesExtensionsToolsetPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
<MicrosoftWindowsDesktopAppInternalPackageVersion>10.0.0-preview.7.25359.101</MicrosoftWindowsDesktopAppInternalPackageVersion>
<MicrosoftWindowsDesktopAppRefPackageVersion>10.0.0-preview.7.25359.101</MicrosoftWindowsDesktopAppRefPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/nuget/nuget.client -->
<NuGetBuildTasksPackageVersion>7.0.0-preview.1.23</NuGetBuildTasksPackageVersion>
Expand Down Expand Up @@ -241,7 +232,6 @@
<MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>10.0.0-preview.7.25359.101</MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>
<MicrosoftAspNetCoreAnalyzersPackageVersion>10.0.0-preview.7.25359.101</MicrosoftAspNetCoreAnalyzersPackageVersion>
<MicrosoftAspNetCoreTestHostPackageVersion>10.0.0-preview.7.25359.101</MicrosoftAspNetCoreTestHostPackageVersion>
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>10.0.0-preview.5.25265.101</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
<MicrosoftAspNetCoreAppRefInternalPackageVersion>10.0.0-preview.7.25359.101</MicrosoftAspNetCoreAppRefInternalPackageVersion>
<MicrosoftAspNetCoreAuthenticationFacebookVersion>10.0.0-preview.7.25359.101</MicrosoftAspNetCoreAuthenticationFacebookVersion>
<MicrosoftAspNetCoreAuthenticationGoogleVersion>10.0.0-preview.7.25359.101</MicrosoftAspNetCoreAuthenticationGoogleVersion>
Expand All @@ -260,7 +250,6 @@
<MicrosoftExtensionsFileProvidersEmbeddedVersion>10.0.0-preview.7.25359.101</MicrosoftExtensionsFileProvidersEmbeddedVersion>
<MicrosoftDotNetWebItemTemplates100PackageVersion>10.0.0-preview.7.25359.101</MicrosoftDotNetWebItemTemplates100PackageVersion>
<MicrosoftDotNetWebProjectTemplates100PackageVersion>10.0.0-preview.7.25359.101</MicrosoftDotNetWebProjectTemplates100PackageVersion>
<VSRedistCommonAspNetCoreSharedFrameworkx64100PackageVersion>10.0.0-preview.5.25265.101</VSRedistCommonAspNetCoreSharedFrameworkx64100PackageVersion>
<dotnetdevcertsPackageVersion>10.0.0-preview.7.25359.101</dotnetdevcertsPackageVersion>
<dotnetuserjwtsPackageVersion>10.0.0-preview.7.25359.101</dotnetuserjwtsPackageVersion>
<dotnetusersecretsPackageVersion>10.0.0-preview.7.25359.101</dotnetusersecretsPackageVersion>
Expand All @@ -282,11 +271,6 @@
<EmscriptenVersionNet7>3.1.12</EmscriptenVersionNet7>
<EmscriptenVersionNet6>2.0.23</EmscriptenVersionNet6>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/wpf -->
<MicrosoftNETSdkWindowsDesktopPackageVersion>10.0.0-preview.7.25359.101</MicrosoftNETSdkWindowsDesktopPackageVersion>
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>10.0.0-preview.7.25359.101</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
</PropertyGroup>
<PropertyGroup Label="Infrastructure and test only dependencies">
<VersionToolsVersion>2.2.0-beta.19072.10</VersionToolsVersion>
<MicrosoftDotNetScenarioTestsSdkTemplateTestsVersion>10.0.0-preview.24602.1</MicrosoftDotNetScenarioTestsSdkTemplateTestsVersion>
Expand Down
4 changes: 2 additions & 2 deletions src/Layout/redist/targets/BundledTemplates.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
<ItemGroup Label=".NET 10.0 templates">
<Bundled100Templates Include="Microsoft.DotNet.Web.ItemTemplates.10.0" PackageVersion="$(MicrosoftDotNetWebItemTemplates100PackageVersion)" />
<Bundled100Templates Include="Microsoft.DotNet.Web.ProjectTemplates.10.0" PackageVersion="$(MicrosoftDotNetWebProjectTemplates100PackageVersion)" UseVersionForTemplateInstallPath="true" />
<Bundled100Templates Include="Microsoft.Dotnet.WinForms.ProjectTemplates" PackageVersion="$(MicrosoftDotNetWinFormsProjectTemplatesPackageVersion)" Condition="'$(DotNetBuildSourceOnly)' != 'true'" />
<Bundled100Templates Include="Microsoft.Dotnet.Wpf.ProjectTemplates" PackageVersion="$(MicrosoftDotNetWpfProjectTemplatesPackageVersion)" Condition="'$(DotNetBuildSourceOnly)' != 'true'" />
<Bundled100Templates Include="Microsoft.Dotnet.WinForms.ProjectTemplates" PackageVersion="$(MicrosoftNETSdkWindowsDesktopPackageVersion)" Condition="'$(DotNetBuildSourceOnly)' != 'true'" />
<Bundled100Templates Include="Microsoft.Dotnet.Wpf.ProjectTemplates" PackageVersion="$(MicrosoftNETSdkWindowsDesktopPackageVersion)" Condition="'$(DotNetBuildSourceOnly)' != 'true'" />
</ItemGroup>

<ItemGroup>
Expand Down
14 changes: 5 additions & 9 deletions src/Layout/redist/targets/GenerateBundledVersions.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,18 +32,14 @@
<Output TaskParameter="DependencyCommit" PropertyName="DepAspNetCoreCommit" />
</GetDependencyInfo>

<GetDependencyInfo
VersionDetailsXmlFile="$(RepositoryEngineeringDir)Version.Details.xml"
DependencyName="Microsoft.WindowsDesktop.App.Ref"
Condition="'$(DotNetBuildFromVMR)' != 'true'">
<Output TaskParameter="DependencyVersion" PropertyName="DepWindowsDesktopVersion" />
<Output TaskParameter="DependencyCommit" PropertyName="DepWindowsDesktopCommit" />
</GetDependencyInfo>

<ItemGroup Label="Version info">
<Line Include="runtime" Version="$(MicrosoftNETCoreAppRefPackageVersion)" Commit="$([MSBuild]::ValueOrDefault('$(DepRuntimeCommit)', '$(BUILD_SOURCEVERSION)'))" />
<Line Include="aspnetcore" Version="$(MicrosoftAspNetCoreAppRefPackageVersion)" Commit="$([MSBuild]::ValueOrDefault('$(DepAspNetCoreCommit)', '$(BUILD_SOURCEVERSION)'))" />
<Line Include="windowsdesktop" Version="$(MicrosoftWindowsDesktopAppRefPackageVersion)" Commit="$([MSBuild]::ValueOrDefault('$(DepWindowsDesktopCommit)', '$(BUILD_SOURCEVERSION)'))" />
<!-- For the WindowsDesktop commit, use the Microsoft.NETCore.App.Ref commit.
These will always be the same and the Microsoft.WindowsDesktop.App.Ref dependency has been eliminated from Version.Details.xml
so the info cannot be used since in VMR builds Linux/Mac do not build WindowsDesktop, even though
info about WindowsDesktop **does** leak into those SDKs. -->
<Line Include="windowsdesktop" Version="$(MicrosoftWindowsDesktopAppRefPackageVersion)" Commit="$([MSBuild]::ValueOrDefault('$(DepRuntimeCommit)', '$(BUILD_SOURCEVERSION)'))" />
<Line Include="sdk" Version="$(PackageVersion)" Commit="$(BUILD_SOURCEVERSION)" />
</ItemGroup>

Expand Down