Merge branch 'main' into dev/snickler/coretfm-msbuildproperty

[Build] Update logic for CoreTargetFramework
CoreTargetFramework will be the TargetFramework without OS and OS Version. The TargetFramework will use the property with the OS and OS Version appended.
2026-01-08 21:36:54 +01:00 · 2025-08-27 11:37:19 -04:00 · 2025-08-25 19:52:44 -04:00 · 2025-08-25 19:09:20 -04:00 · 2025-08-25 19:07:31 -04:00 · 2025-08-25 19:06:23 -04:00
3 changed files with 5 additions and 4 deletions
--- a/src/Common.Dotnet.CsWinRT.props
+++ b/src/Common.Dotnet.CsWinRT.props
@@ -4,8 +4,9 @@
  <Import Project=".\Common.Dotnet.PrepareGeneratedFolder.targets" />

  <PropertyGroup>
+    <CoreTargetFramework>net9.0</CoreTargetFramework>
    <WindowsSdkPackageVersion>10.0.26100.68-preview</WindowsSdkPackageVersion>
-    <TargetFramework>net9.0-windows10.0.26100.0</TargetFramework>
+    <TargetFramework>$(CoreTargetFramework)-windows10.0.26100.0</TargetFramework>
    <TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
    <SupportedOSPlatformVersion>10.0.19041.0</SupportedOSPlatformVersion>
    <RuntimeIdentifiers>win-x64;win-arm64</RuntimeIdentifiers>
--- a/src/settings-ui/Settings.UI.XamlIndexBuilder/Settings.UI.XamlIndexBuilder.csproj
+++ b/src/settings-ui/Settings.UI.XamlIndexBuilder/Settings.UI.XamlIndexBuilder.csproj
@@ -3,7 +3,7 @@
 	<Import Project="..\..\Common.Dotnet.CsWinRT.props" />

 	<PropertyGroup>
-		<TargetFramework>net9.0</TargetFramework>
+		<TargetFramework>$(CoreTargetFramework)</TargetFramework>
 		<OutputType>Exe</OutputType>
 	<RootNamespace>Microsoft.PowerToys.Tools.XamlIndexBuilder</RootNamespace>
 		<AssemblyName>XamlIndexBuilder</AssemblyName>
--- a/src/settings-ui/Settings.UI/PowerToys.Settings.csproj
+++ b/src/settings-ui/Settings.UI/PowerToys.Settings.csproj
@@ -183,6 +183,6 @@

 	<Target Name="BuildXamlIndexBeforeSettings" BeforeTargets="CoreCompile">
 		<Message Importance="high" Text="[Settings] Building XamlIndexBuilder prior to compile. Views='$(MSBuildProjectDirectory)\SettingsXAML\Views' Out='$(GeneratedJsonFile)'" />
-		<MSBuild Projects="..\Settings.UI.XamlIndexBuilder\Settings.UI.XamlIndexBuilder.csproj" Targets="Build" Properties="Configuration=$(Configuration);Platform=Any CPU;TargetFramework=net9.0;XamlViewsDir=$(MSBuildProjectDirectory)\SettingsXAML\Views;GeneratedJsonFile=$(GeneratedJsonFile)" />
+		<MSBuild Projects="..\Settings.UI.XamlIndexBuilder\Settings.UI.XamlIndexBuilder.csproj" Targets="Build" Properties="Configuration=$(Configuration);Platform=Any CPU;TargetFramework=$(CoreTargetFramework);XamlViewsDir=$(MSBuildProjectDirectory)\SettingsXAML\Views;GeneratedJsonFile=$(GeneratedJsonFile)" />
 	</Target>
-</Project>
+</Project>
Author	SHA1	Message	Date
Jeremy Sinclair	fd8148bda2	Merge branch 'main' into dev/snickler/coretfm-msbuildproperty	2025-08-27 11:37:19 -04:00
Jeremy Sinclair	010d6352e3	[Build] Update logic for CoreTargetFramework CoreTargetFramework will be the TargetFramework without OS and OS Version. The TargetFramework will use the property with the OS and OS Version appended.	2025-08-25 19:52:44 -04:00
Jeremy Sinclair	33c7d3a6c9	[Build][Settings] Update BuildXamlIndexBeforeSettings Target to use CoreTargetFramework property	2025-08-25 19:09:20 -04:00
Jeremy Sinclair	ce911031e7	[Build] Change TargetFramework to use CoreTargetFramework	2025-08-25 19:07:31 -04:00
Jeremy Sinclair	d155abb4c0	[Build] Add CoreTargetFramework property to CsWinRT.props Add CoreTargetFramework MSBuild Property to return the TargetFramework without the OS and Version values.	2025-08-25 19:06:23 -04:00