From f20aecb14dc0f62299424c2a088ff4d8a8376315 Mon Sep 17 00:00:00 2001
From: Arlo Godfrey <arlo.godfrey@outlook.com>
Date: Fri, 25 Aug 2023 13:43:29 -0500
Subject: [PATCH] [WIP] Added net7 as Wasdk Tfm

---
 MultiTarget/AvailableTargetFrameworks.props | 2 +-
 MultiTarget/EnabledTargetFrameworks.props   | 3 ++-
 MultiTarget/MultiTargetIdentifiers.props    | 2 +-
 ProjectHeads/App.Head.props                 | 2 +-
 ProjectHeads/Tests.Head.props               | 2 +-
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/MultiTarget/AvailableTargetFrameworks.props b/MultiTarget/AvailableTargetFrameworks.props
index 26f5bdef..005f4a55 100644
--- a/MultiTarget/AvailableTargetFrameworks.props
+++ b/MultiTarget/AvailableTargetFrameworks.props
@@ -1,7 +1,7 @@
 <Project>
     <PropertyGroup>
         <UwpTargetFramework>uap10.0.17763</UwpTargetFramework>
-        <WinAppSdkTargetFramework>net6.0-windows10.0.19041.0</WinAppSdkTargetFramework>
+        <WinAppSdkTargetFramework>net6.0-windows10.0.19041.0;net7.0-windows10.0.19041.0</WinAppSdkTargetFramework>
         
         <WasmHeadTargetFramework>net7.0</WasmHeadTargetFramework>
         <LinuxHeadTargetFramework>net7.0</LinuxHeadTargetFramework>
diff --git a/MultiTarget/EnabledTargetFrameworks.props b/MultiTarget/EnabledTargetFrameworks.props
index 2beb13f5..fda1f43a 100644
--- a/MultiTarget/EnabledTargetFrameworks.props
+++ b/MultiTarget/EnabledTargetFrameworks.props
@@ -1,7 +1,7 @@
 <Project>
     <PropertyGroup>
         <UwpTargetFramework>uap10.0.17763</UwpTargetFramework>
-        <WinAppSdkTargetFramework>net6.0-windows10.0.19041.0</WinAppSdkTargetFramework>
+        <WinAppSdkTargetFramework>net6.0-windows10.0.19041.0;net7.0-windows10.0.19041.0</WinAppSdkTargetFramework>
         
         <WasmHeadTargetFramework>net7.0</WasmHeadTargetFramework>
         <LinuxHeadTargetFramework>net7.0</LinuxHeadTargetFramework>
@@ -17,3 +17,4 @@
         <DotnetCommonTargetFramework>net7.0</DotnetCommonTargetFramework>
     </PropertyGroup>
 </Project>
+ 
\ No newline at end of file
diff --git a/MultiTarget/MultiTargetIdentifiers.props b/MultiTarget/MultiTargetIdentifiers.props
index 2d215abc..f945f777 100644
--- a/MultiTarget/MultiTargetIdentifiers.props
+++ b/MultiTarget/MultiTargetIdentifiers.props
@@ -42,7 +42,7 @@
     <IsGtk Condition="'$(IsGtk)' == '' AND ('$(IsGtkHead)' == 'true' or '$(IsGtkLib)' == 'true')">true</IsGtk>
 
     <IsUwp Condition="'$(IsUwp)' == '' AND '$(TargetFramework)' == '$(UwpTargetFramework)' AND '$(UwpTargetFramework)' != '' AND '$(MultiTargetsUwp)' == 'true'">true</IsUwp>
-    <IsWinAppSdk Condition="'$(IsWinAppSdk)' == '' AND '$(TargetFramework)' == '$(WinAppSdkTargetFramework)' AND '$(WinAppSdkTargetFramework)' != '' AND '$(MultiTargetsWasdk)' == 'true'">true</IsWinAppSdk>
+    <IsWinAppSdk Condition="'$(IsWinAppSdk)' == '' AND '$(WinAppSdkTargetFramework.Contains($(TargetFramework)))' == 'true' AND '$(WinAppSdkTargetFramework)' != '' AND '$(MultiTargetsWasdk)' == 'true'">true</IsWinAppSdk>
     <IsDroid Condition="'$(IsDroid)' == '' AND '$(TargetFramework)' == '$(AndroidLibTargetFramework)' AND '$(AndroidLibTargetFramework)' != '' AND '$(MultiTargetsDroid)' == 'true'">true</IsDroid>
     <IsMacOS Condition="'$(IsMacOS)' == '' AND '$(TargetFramework)' == '$(MacOSLibTargetFramework)' AND '$(MacOSLibTargetFramework)' != '' AND '$(MultiTargetsMacOS)' == 'true'">true</IsMacOS>
     <IsiOS Condition="'$(IsiOS)' == '' AND '$(TargetFramework)' == '$(iOSLibTargetFramework)' AND '$(iOSLibTargetFramework)' != '' AND '$(MultiTargetsiOS)' == 'true'">true</IsiOS>
diff --git a/ProjectHeads/App.Head.props b/ProjectHeads/App.Head.props
index 05925acc..bf583a71 100644
--- a/ProjectHeads/App.Head.props
+++ b/ProjectHeads/App.Head.props
@@ -9,7 +9,7 @@
   </ItemGroup>
 
   <!-- Source generators -->
-  <ItemGroup Condition="'$(TargetFramework)' != '$(WinAppSdkTargetFramework)'">
+  <ItemGroup Condition="'$(IsWinAppSdk)' != 'true'">
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.0.1" PrivateAssets="all" />
     <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.3" PrivateAssets="all" />
   </ItemGroup>
diff --git a/ProjectHeads/Tests.Head.props b/ProjectHeads/Tests.Head.props
index 0e8f90fc..e36490bd 100644
--- a/ProjectHeads/Tests.Head.props
+++ b/ProjectHeads/Tests.Head.props
@@ -1,6 +1,6 @@
 <Project>
   <!-- Source generators -->
-  <ItemGroup Condition="'$(TargetFramework)' != '$(WinAppSdkTargetFramework)'">
+  <ItemGroup Condition="'$(IsWinAppSdk)' != 'true'">
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.0.1" PrivateAssets="all" />
     <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.3" PrivateAssets="all" />
   </ItemGroup>