Fix MultiTarget imports in all project heads

CommunityToolkit · Dec 21, 2024 · b7521ef · b7521ef
1 parent 7036724
commit b7521ef
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 2 deletions.
diff --git a/ProjectHeads/AllComponents/Tests.Uwp/CommunityToolkit.Tests.Uwp.csproj b/ProjectHeads/AllComponents/Tests.Uwp/CommunityToolkit.Tests.Uwp.csproj
@@ -9,7 +9,10 @@
     <WinUIMajorVersion>2</WinUIMajorVersion>
   </PropertyGroup>
 
+  <Import Project="$(ToolingDirectory)\MultiTarget\EnabledMultiTargets.props" />
+  <Import Project="$(ToolingDirectory)\MultiTarget\AvailableTargetFrameworks.props" />
   <Import Project="$(ToolingDirectory)\MultiTarget\EnabledTargetFrameworks.props" />
+
   <Import Project="$(ToolingDirectory)\MultiTarget\DefinedConstants.props" />
 
   <Import Project="$(ToolingDirectory)\ProjectHeads\Tests.Head.Uwp.props" />

diff --git a/ProjectHeads/AllComponents/Tests.Wasdk/CommunityToolkit.Tests.Wasdk.csproj b/ProjectHeads/AllComponents/Tests.Wasdk/CommunityToolkit.Tests.Wasdk.csproj
@@ -7,7 +7,10 @@
     <WinUIMajorVersion>3</WinUIMajorVersion>
   </PropertyGroup>
 
+  <Import Project="$(ToolingDirectory)\MultiTarget\EnabledMultiTargets.props" />
+  <Import Project="$(ToolingDirectory)\MultiTarget\AvailableTargetFrameworks.props" />
   <Import Project="$(ToolingDirectory)\MultiTarget\EnabledTargetFrameworks.props" />
+
   <Import Project="$(ToolingDirectory)\MultiTarget\DefinedConstants.props" />
 
   <Import Project="$(ToolingDirectory)\ProjectHeads\Tests.Head.WinAppSdk.props" />

diff --git a/ProjectHeads/SingleComponent/Tests.Uwp/ProjectTemplate.Tests.Uwp.csproj b/ProjectHeads/SingleComponent/Tests.Uwp/ProjectTemplate.Tests.Uwp.csproj
@@ -11,7 +11,10 @@
     <IsSingleExperimentHead>true</IsSingleExperimentHead>
   </PropertyGroup>
 
+  <Import Project="$(ToolingDirectory)\MultiTarget\EnabledMultiTargets.props" />
+  <Import Project="$(ToolingDirectory)\MultiTarget\AvailableTargetFrameworks.props" />
   <Import Project="$(ToolingDirectory)\MultiTarget\EnabledTargetFrameworks.props" />
+
   <Import Project="$(ToolingDirectory)\MultiTarget\DefinedConstants.props" />
 
   <Import Project="$(ToolingDirectory)\ProjectHeads\Tests.Head.Uwp.props" />

diff --git a/ProjectHeads/SingleComponent/Tests.Wasdk/ProjectTemplate.Tests.Wasdk.csproj b/ProjectHeads/SingleComponent/Tests.Wasdk/ProjectTemplate.Tests.Wasdk.csproj
@@ -9,7 +9,10 @@
     <IsSingleExperimentHead>true</IsSingleExperimentHead>
   </PropertyGroup>
 
+  <Import Project="$(ToolingDirectory)\MultiTarget\EnabledMultiTargets.props" />
+  <Import Project="$(ToolingDirectory)\MultiTarget\AvailableTargetFrameworks.props" />
   <Import Project="$(ToolingDirectory)\MultiTarget\EnabledTargetFrameworks.props" />
+
   <Import Project="$(ToolingDirectory)\MultiTarget\DefinedConstants.props" />
 
   <Import Project="$(ToolingDirectory)\ProjectHeads\Tests.Head.WinAppSdk.props" />

diff --git a/ProjectHeads/SingleComponent/Uwp/ProjectTemplate.Uwp.csproj b/ProjectHeads/SingleComponent/Uwp/ProjectTemplate.Uwp.csproj
@@ -11,7 +11,10 @@
     <IsSingleExperimentHead>true</IsSingleExperimentHead>
   </PropertyGroup>
 
+  <Import Project="$(ToolingDirectory)\MultiTarget\EnabledMultiTargets.props" />
+  <Import Project="$(ToolingDirectory)\MultiTarget\AvailableTargetFrameworks.props" />
   <Import Project="$(ToolingDirectory)\MultiTarget\EnabledTargetFrameworks.props" />
+
   <Import Project="$(ToolingDirectory)\MultiTarget\DefinedConstants.props" />
   <Import Project="$(ToolingDirectory)\ProjectHeads\App.Head.Uwp.props" />
 

diff --git a/ProjectHeads/SingleComponent/Wasdk/ProjectTemplate.Wasdk.csproj b/ProjectHeads/SingleComponent/Wasdk/ProjectTemplate.Wasdk.csproj
@@ -10,7 +10,10 @@
     <IsSingleExperimentHead>true</IsSingleExperimentHead>
   </PropertyGroup>
 
-  <Import Project="$(ToolingDirectory)\MultiTarget\DefinedConstants.props" />
+  <Import Project="$(ToolingDirectory)\MultiTarget\EnabledMultiTargets.props" />
+  <Import Project="$(ToolingDirectory)\MultiTarget\AvailableTargetFrameworks.props" />
+  <Import Project="$(ToolingDirectory)\MultiTarget\EnabledTargetFrameworks.props" />
+
   <Import Project="$(ToolingDirectory)\ProjectHeads\App.Head.WinAppSdk.props" />
 
   <ItemGroup>

diff --git a/ProjectHeads/SingleComponent/Wasm/ProjectTemplate.Wasm.csproj b/ProjectHeads/SingleComponent/Wasm/ProjectTemplate.Wasm.csproj
@@ -11,8 +11,11 @@
   </PropertyGroup>
 
   <Import Project="$(ToolingDirectory)\MultiTarget\WinUI.TargetVersion.props" />
-
+
+  <Import Project="$(ToolingDirectory)\MultiTarget\EnabledMultiTargets.props" />
+  <Import Project="$(ToolingDirectory)\MultiTarget\AvailableTargetFrameworks.props" />
   <Import Project="$(ToolingDirectory)\MultiTarget\EnabledTargetFrameworks.props" />
+
   <Import Project="$(ToolingDirectory)\MultiTarget\DefinedConstants.props" />
   <Import Project="$(ToolingDirectory)\ProjectHeads\App.Head.Wasm.props" />