From 59dff4161f32c968bffb6a304c85c6325f0edb17 Mon Sep 17 00:00:00 2001
From: James Clancey <james.clancey@gmail.com>
Date: Wed, 9 Nov 2022 13:24:56 -0900
Subject: [PATCH] Updated to net.7

---
 Comet.nuspec                 | 42 ++++++++++++++----------------------
 src/Comet/Comet.csproj       | 14 +++++++-----
 src/Comet/Comet.debug.csproj | 17 +++++++++------
 3 files changed, 35 insertions(+), 38 deletions(-)

diff --git a/Comet.nuspec b/Comet.nuspec
index 2ecd749c..d1c05543 100644
--- a/Comet.nuspec
+++ b/Comet.nuspec
@@ -15,28 +15,18 @@
     <license type="expression">MIT</license>
     <language>C#</language>
     <dependencies>
-      <group targetFramework=".NETStandard2.1">
-        <dependency id="Microsoft.Maui.Graphics" version="6.0.100-rc.2.470" exclude="Build,Analyzers" />
-        <dependency id="Microsoft.Extensions.Configuration" version="6.0.0" />
-        <dependency id="Microsoft.Extensions.Hosting" version="6.0.0" />
-        <dependency id="Microsoft.Extensions.Hosting.Abstractions" version="6.0.0" />
-        <dependency id="Microsoft.Extensions.Logging" version="6.0.0" />
-        <dependency id="Microsoft.Extensions.Logging.Abstractions" version="6.0.0" />
-        <dependency id="Microsoft.Extensions.DependencyInjection" version="6.0.0" />
-        <dependency id="Microsoft.Extensions.Configuration" version="6.0.0" />
+      <group targetFramework="net7.0-android30.0">
       </group>
-      <group targetFramework="net6.0-android30.0">
+      <group targetFramework="net7.0-ios13.6">
       </group>
-      <group targetFramework="net6.0-ios13.6">
-      </group>
-      <group targetFramework="net6.0-maccatalyst13.5">
+      <group targetFramework="net7.0-maccatalyst13.5">
       </group>      
-      <group targetFramework="net6.0-windows10.0.19041">
+      <group targetFramework="net7.0-windows10.0.19041">
       </group>
     </dependencies>
   </metadata>
   <files>
-    <file src="Directory.Build.targets" target="build/Clancey.Comet.targets"/>
+    <!-- <file src="Directory.Build.targets" target="build/Clancey.Comet.targets"/> -->
     <!-- <file src="Directory.Build.props" target="build/Clancey.Comet.props"/>
     <file src="src/Comet/bin/Debug/netstandard2.0/Comet.dll" target="lib/netstandard2.0/Comet.dll"/>
     <file src="src/Comet/bin/Debug/netstandard2.0/Comet.pdb" target="lib/netstandard2.0/Comet.pdb"/>
@@ -44,17 +34,17 @@
     <file src="src/Comet/bin/Debug/netstandard2.0/Microsoft.Maui.pdb" target="lib/netstandard2.0/Microsoft.Maui.pdb"/>
     <file src="src/Comet/bin/Debug/netstandard2.0/Microsoft.Maui.Essentials.dll" target="lib/netstandard2.0/Microsoft.Maui.Essentials.dll"/>
     <file src="src/Comet/bin/Debug/netstandard2.0/Microsoft.Maui.Essentials.pdb" target="lib/netstandard2.0/Microsoft.Maui.Essentials.pdb"/> -->
-    <file src="src/Comet/bin/Debug/net6.0-ios/Comet.dll" target="lib/net6.0-ios13.6/Comet.dll"/>
-    <file src="src/Comet/bin/Debug/net6.0-ios/Comet.pdb" target="lib/net6.0-ios13.6/Comet.pdb"/>
-    <file src="src/Comet/bin/Debug/net6.0/Comet.dll" target="lib/net6.0/Comet.dll"/>
-    <file src="src/Comet/bin/Debug/net6.0/Comet.pdb" target="lib/net6.0/Comet.pdb"/>
-    <file src="src/Comet/bin/Debug/net6.0-android/Comet.dll" target="lib/net6.0-android30.0/Comet.dll"/>
-    <file src="src/Comet/bin/Debug/net6.0-android/Comet.pdb" target="lib/net6.0-android30.0/Comet.pdb"/>
-    <file src="src/Comet/bin/Debug/net6.0-maccatalyst/Comet.dll" target="lib/net6.0-maccatalyst13.5/Comet.dll"/>
-    <file src="src/Comet/bin/Debug/net6.0-maccatalyst/Comet.pdb" target="lib/net6.0-maccatalyst13.5/Comet.pdb"/>
-    <file src="src/Comet/bin/Debug/net6.0-windows10.0.19041/Comet.dll" target="lib/net6.0-windows10.0.19041/Comet.dll"/>
-    <file src="src/Comet/bin/Debug/net6.0-windows10.0.19041/Comet.pdb" target="lib/net6.0-windows10.0.19041/Comet.pdb"/>
-    <file src="external/Maui/.nuspec/Microsoft.Maui.Controls.MultiTargeting.targets" target="build/Microsoft.Maui.Controls.MultiTargeting.targets" />
+    <file src="src/Comet/bin/Debug/net7.0-ios/Comet.dll" target="lib/net7.0-ios13.6/Comet.dll"/>
+    <file src="src/Comet/bin/Debug/net7.0-ios/Comet.pdb" target="lib/net7.0-ios13.6/Comet.pdb"/>
+    <file src="src/Comet/bin/Debug/net7.0/Comet.dll" target="lib/net7.0/Comet.dll"/>
+    <file src="src/Comet/bin/Debug/net7.0/Comet.pdb" target="lib/net7.0/Comet.pdb"/>
+    <file src="src/Comet/bin/Debug/net7.0-android/Comet.dll" target="lib/net7.0-android30.0/Comet.dll"/>
+    <file src="src/Comet/bin/Debug/net7.0-android/Comet.pdb" target="lib/net7.0-android30.0/Comet.pdb"/>
+    <file src="src/Comet/bin/Debug/net7.0-maccatalyst/Comet.dll" target="lib/net7.0-maccatalyst13.5/Comet.dll"/>
+    <file src="src/Comet/bin/Debug/net7.0-maccatalyst/Comet.pdb" target="lib/net7.0-maccatalyst13.5/Comet.pdb"/>
+    <file src="src/Comet/bin/Debug/net7.0-windows10.0.19041/Comet.dll" target="lib/net7.0-windows10.0.19041/Comet.dll"/>
+    <file src="src/Comet/bin/Debug/net7.0-windows10.0.19041/Comet.pdb" target="lib/net7.0-windows10.0.19041/Comet.pdb"/>
+    <!-- <file src="external/Maui/.nuspec/Microsoft.Maui.Controls.MultiTargeting.targets" target="build/Microsoft.Maui.Controls.MultiTargeting.targets" /> -->
     <file src="src/Comet.SourceGenerator/bin/Debug/netstandard2.0/Comet.SourceGenerator.dll" target="analyzers/cs/Comet.SourceGenerator.dll"/>
     <file src="src/Comet.SourceGenerator/bin/Debug/netstandard2.0/Stubble.Core.dll" target="analyzers/cs/Stubble.Core.dll"/>
   </files>
diff --git a/src/Comet/Comet.csproj b/src/Comet/Comet.csproj
index 80257ccc..230b8a4b 100644
--- a/src/Comet/Comet.csproj
+++ b/src/Comet/Comet.csproj
@@ -1,16 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFrameworks>net6.0;net6.0-android;net6.0-ios;net6.0-maccatalyst</TargetFrameworks>
-		<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows')) and '$(MSBuildRuntimeType)' == 'Full'">$(TargetFrameworks);net6.0-windows10.0.19041</TargetFrameworks>
+		<TargetFrameworks>net7.0;net7.0-android;net7.0-ios;net7.0-maccatalyst</TargetFrameworks>
+		<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows')) and '$(MSBuildRuntimeType)' == 'Full'">$(TargetFrameworks);net7.0-windows10.0.19041.0</TargetFrameworks>
 		<RootNamespace>Comet</RootNamespace>
 		<AssemblyName>Comet</AssemblyName>
 		<UseMaui>true</UseMaui>
 		<SingleProject>true</SingleProject>
 		<LangVersion>preview</LangVersion>
-		<SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'net6.0-ios'">14.2</SupportedOSPlatformVersion>
-		<SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'net6.0-maccatalyst'">14.0</SupportedOSPlatformVersion>
-		<SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'net6.0-android'">21.0</SupportedOSPlatformVersion>
+
+		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">11.0</SupportedOSPlatformVersion>
+		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">13.1</SupportedOSPlatformVersion>
+		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">21.0</SupportedOSPlatformVersion>
+		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</SupportedOSPlatformVersion>
+		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'tizen'">6.5</SupportedOSPlatformVersion>
+
 	</PropertyGroup>
 	<ItemGroup>
 		<ProjectReference Include="..\Comet.SourceGenerator\Comet.SourceGenerator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false">
diff --git a/src/Comet/Comet.debug.csproj b/src/Comet/Comet.debug.csproj
index ab38e751..342721f7 100644
--- a/src/Comet/Comet.debug.csproj
+++ b/src/Comet/Comet.debug.csproj
@@ -1,17 +1,20 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net6.0;net6.0-android;net6.0-ios;net6.0-maccatalyst</TargetFrameworks>
-		<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows')) and '$(MSBuildRuntimeType)' == 'Full'">$(TargetFrameworks);net6.0-windows10.0.19041</TargetFrameworks>
+		<TargetFrameworks>net7.0;net7.0-android;net7.0-ios;net7.0-maccatalyst</TargetFrameworks>
+		<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows')) and '$(MSBuildRuntimeType)' == 'Full'">$(TargetFrameworks);net7.0-windows10.0.19041.0</TargetFrameworks>
 		<RootNamespace>Comet</RootNamespace>
 		<AssemblyName>Comet</AssemblyName>
+		<UseMaui>true</UseMaui>
 		<SingleProject>true</SingleProject>
 		<LangVersion>preview</LangVersion>
-		<SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'net6.0-ios'">14.2</SupportedOSPlatformVersion>
-		<SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'net6.0-maccatalyst'">14.0</SupportedOSPlatformVersion>
-		<SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'net6.0-android'">21.0</SupportedOSPlatformVersion>
-		<SupportedOSPlatformVersion Condition="$(TargetFramework.Contains('-windows'))">10.0.17763.0</SupportedOSPlatformVersion>
-		<TargetPlatformMinVersion Condition="$(TargetFramework.Contains('-windows'))">10.0.17763.0</TargetPlatformMinVersion>
+
+		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">11.0</SupportedOSPlatformVersion>
+		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">13.1</SupportedOSPlatformVersion>
+		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">21.0</SupportedOSPlatformVersion>
+		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</SupportedOSPlatformVersion>
+		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'tizen'">6.5</SupportedOSPlatformVersion>
+
 	</PropertyGroup>
 
 	<ItemGroup>