diff --git a/Comet.WinUI.sln b/Comet.WinUI.sln index 664961d8..339e73fd 100644 --- a/Comet.WinUI.sln +++ b/Comet.WinUI.sln @@ -1,32 +1,22 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 -VisualStudioVersion = 16.0.29020.237 +VisualStudioVersion = 16.0.31410.223 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Comet-net6", "src\Comet\Comet-net6.csproj", "{1817646E-E71E-48CF-80A4-3030EF870D61}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Sample", "Sample", "{C3FDCDB7-0C29-472D-A406-E2F21A4B0EAE}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{586C3CCB-82A5-47F0-A099-B9A31BB4EA88}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{BC86B934-3C23-4DA8-A4F4-BB2B0C298DF5}" ProjectSection(SolutionItems) = preProject .editorconfig = .editorconfig EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core-net6", "external\Maui\src\Core\src\Core-net6.csproj", "{8A53D192-072F-4EF2-8547-932D7538FFB9}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Comet.Tests", "tests\Comet.Tests\Comet.Tests.csproj", "{A94A318E-1F79-4AE9-9620-58D941382410}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Essentials-net6", "external\Maui\src\Essentials\src\Essentials-net6.csproj", "{E2F234D6-3B2C-4F5E-B815-6D61B8AA5DC6}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Comet.Samples-net6", "sample\Comet.Samples\Comet.Samples-net6.csproj", "{D4931444-94DD-49C6-8AFC-2228CDBDD5EA}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Comet.SingleProject.Sample", "sample\Comet.SingleProject.Sample\Comet.SingleProject.Sample.csproj", "{F193CE01-DF8B-4BC1-B9D5-C259455F61D6}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Comet.Sample.WinUI", "sample\Comet.Sample.WinUI\Comet.Sample.WinUI.csproj", "{66CF623C-9A8E-43C3-BD26-7F97FC443914}" -EndProject -Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "Comet.Sample.WinUI (Package)", "sample\Comet.Sample.WinUI (Package)\Comet.Sample.WinUI (Package).wapproj", "{503B7824-7376-450B-9EF7-EA587DF2C8BE}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Comet.Sample.WinUI", "sample\Comet.Sample.WinUI\Comet.Sample.WinUI.csproj", "{57F70ECE-2779-4DDC-801F-ECF819EF478B}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -74,89 +64,6 @@ Global {1817646E-E71E-48CF-80A4-3030EF870D61}.Release|x64.Build.0 = Release|Any CPU {1817646E-E71E-48CF-80A4-3030EF870D61}.Release|x86.ActiveCfg = Release|Any CPU {1817646E-E71E-48CF-80A4-3030EF870D61}.Release|x86.Build.0 = Release|Any CPU - {8A53D192-072F-4EF2-8547-932D7538FFB9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8A53D192-072F-4EF2-8547-932D7538FFB9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8A53D192-072F-4EF2-8547-932D7538FFB9}.Debug|ARM.ActiveCfg = Debug|Any CPU - {8A53D192-072F-4EF2-8547-932D7538FFB9}.Debug|ARM.Build.0 = Debug|Any CPU - {8A53D192-072F-4EF2-8547-932D7538FFB9}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {8A53D192-072F-4EF2-8547-932D7538FFB9}.Debug|ARM64.Build.0 = Debug|Any CPU - {8A53D192-072F-4EF2-8547-932D7538FFB9}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {8A53D192-072F-4EF2-8547-932D7538FFB9}.Debug|iPhone.Build.0 = Debug|Any CPU - {8A53D192-072F-4EF2-8547-932D7538FFB9}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {8A53D192-072F-4EF2-8547-932D7538FFB9}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {8A53D192-072F-4EF2-8547-932D7538FFB9}.Debug|x64.ActiveCfg = Debug|Any CPU - {8A53D192-072F-4EF2-8547-932D7538FFB9}.Debug|x64.Build.0 = Debug|Any CPU - {8A53D192-072F-4EF2-8547-932D7538FFB9}.Debug|x86.ActiveCfg = Debug|Any CPU - {8A53D192-072F-4EF2-8547-932D7538FFB9}.Debug|x86.Build.0 = Debug|Any CPU - {8A53D192-072F-4EF2-8547-932D7538FFB9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8A53D192-072F-4EF2-8547-932D7538FFB9}.Release|Any CPU.Build.0 = Release|Any CPU - {8A53D192-072F-4EF2-8547-932D7538FFB9}.Release|ARM.ActiveCfg = Release|Any CPU - {8A53D192-072F-4EF2-8547-932D7538FFB9}.Release|ARM.Build.0 = Release|Any CPU - {8A53D192-072F-4EF2-8547-932D7538FFB9}.Release|ARM64.ActiveCfg = Release|Any CPU - {8A53D192-072F-4EF2-8547-932D7538FFB9}.Release|ARM64.Build.0 = Release|Any CPU - {8A53D192-072F-4EF2-8547-932D7538FFB9}.Release|iPhone.ActiveCfg = Release|Any CPU - {8A53D192-072F-4EF2-8547-932D7538FFB9}.Release|iPhone.Build.0 = Release|Any CPU - {8A53D192-072F-4EF2-8547-932D7538FFB9}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {8A53D192-072F-4EF2-8547-932D7538FFB9}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {8A53D192-072F-4EF2-8547-932D7538FFB9}.Release|x64.ActiveCfg = Release|Any CPU - {8A53D192-072F-4EF2-8547-932D7538FFB9}.Release|x64.Build.0 = Release|Any CPU - {8A53D192-072F-4EF2-8547-932D7538FFB9}.Release|x86.ActiveCfg = Release|Any CPU - {8A53D192-072F-4EF2-8547-932D7538FFB9}.Release|x86.Build.0 = Release|Any CPU - {A94A318E-1F79-4AE9-9620-58D941382410}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A94A318E-1F79-4AE9-9620-58D941382410}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A94A318E-1F79-4AE9-9620-58D941382410}.Debug|ARM.ActiveCfg = Debug|Any CPU - {A94A318E-1F79-4AE9-9620-58D941382410}.Debug|ARM.Build.0 = Debug|Any CPU - {A94A318E-1F79-4AE9-9620-58D941382410}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {A94A318E-1F79-4AE9-9620-58D941382410}.Debug|ARM64.Build.0 = Debug|Any CPU - {A94A318E-1F79-4AE9-9620-58D941382410}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {A94A318E-1F79-4AE9-9620-58D941382410}.Debug|iPhone.Build.0 = Debug|Any CPU - {A94A318E-1F79-4AE9-9620-58D941382410}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {A94A318E-1F79-4AE9-9620-58D941382410}.Debug|x64.ActiveCfg = Debug|Any CPU - {A94A318E-1F79-4AE9-9620-58D941382410}.Debug|x64.Build.0 = Debug|Any CPU - {A94A318E-1F79-4AE9-9620-58D941382410}.Debug|x86.ActiveCfg = Debug|Any CPU - {A94A318E-1F79-4AE9-9620-58D941382410}.Debug|x86.Build.0 = Debug|Any CPU - {A94A318E-1F79-4AE9-9620-58D941382410}.Release|Any CPU.ActiveCfg = Debug|Any CPU - {A94A318E-1F79-4AE9-9620-58D941382410}.Release|Any CPU.Build.0 = Debug|Any CPU - {A94A318E-1F79-4AE9-9620-58D941382410}.Release|ARM.ActiveCfg = Release|Any CPU - {A94A318E-1F79-4AE9-9620-58D941382410}.Release|ARM.Build.0 = Release|Any CPU - {A94A318E-1F79-4AE9-9620-58D941382410}.Release|ARM64.ActiveCfg = Release|Any CPU - {A94A318E-1F79-4AE9-9620-58D941382410}.Release|ARM64.Build.0 = Release|Any CPU - {A94A318E-1F79-4AE9-9620-58D941382410}.Release|iPhone.ActiveCfg = Release|Any CPU - {A94A318E-1F79-4AE9-9620-58D941382410}.Release|iPhone.Build.0 = Release|Any CPU - {A94A318E-1F79-4AE9-9620-58D941382410}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {A94A318E-1F79-4AE9-9620-58D941382410}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {A94A318E-1F79-4AE9-9620-58D941382410}.Release|x64.ActiveCfg = Release|Any CPU - {A94A318E-1F79-4AE9-9620-58D941382410}.Release|x64.Build.0 = Release|Any CPU - {A94A318E-1F79-4AE9-9620-58D941382410}.Release|x86.ActiveCfg = Release|Any CPU - {A94A318E-1F79-4AE9-9620-58D941382410}.Release|x86.Build.0 = Release|Any CPU - {E2F234D6-3B2C-4F5E-B815-6D61B8AA5DC6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E2F234D6-3B2C-4F5E-B815-6D61B8AA5DC6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E2F234D6-3B2C-4F5E-B815-6D61B8AA5DC6}.Debug|ARM.ActiveCfg = Debug|Any CPU - {E2F234D6-3B2C-4F5E-B815-6D61B8AA5DC6}.Debug|ARM.Build.0 = Debug|Any CPU - {E2F234D6-3B2C-4F5E-B815-6D61B8AA5DC6}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {E2F234D6-3B2C-4F5E-B815-6D61B8AA5DC6}.Debug|ARM64.Build.0 = Debug|Any CPU - {E2F234D6-3B2C-4F5E-B815-6D61B8AA5DC6}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {E2F234D6-3B2C-4F5E-B815-6D61B8AA5DC6}.Debug|iPhone.Build.0 = Debug|Any CPU - {E2F234D6-3B2C-4F5E-B815-6D61B8AA5DC6}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {E2F234D6-3B2C-4F5E-B815-6D61B8AA5DC6}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {E2F234D6-3B2C-4F5E-B815-6D61B8AA5DC6}.Debug|x64.ActiveCfg = Debug|Any CPU - {E2F234D6-3B2C-4F5E-B815-6D61B8AA5DC6}.Debug|x64.Build.0 = Debug|Any CPU - {E2F234D6-3B2C-4F5E-B815-6D61B8AA5DC6}.Debug|x86.ActiveCfg = Debug|Any CPU - {E2F234D6-3B2C-4F5E-B815-6D61B8AA5DC6}.Debug|x86.Build.0 = Debug|Any CPU - {E2F234D6-3B2C-4F5E-B815-6D61B8AA5DC6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E2F234D6-3B2C-4F5E-B815-6D61B8AA5DC6}.Release|Any CPU.Build.0 = Release|Any CPU - {E2F234D6-3B2C-4F5E-B815-6D61B8AA5DC6}.Release|ARM.ActiveCfg = Release|Any CPU - {E2F234D6-3B2C-4F5E-B815-6D61B8AA5DC6}.Release|ARM.Build.0 = Release|Any CPU - {E2F234D6-3B2C-4F5E-B815-6D61B8AA5DC6}.Release|ARM64.ActiveCfg = Release|Any CPU - {E2F234D6-3B2C-4F5E-B815-6D61B8AA5DC6}.Release|ARM64.Build.0 = Release|Any CPU - {E2F234D6-3B2C-4F5E-B815-6D61B8AA5DC6}.Release|iPhone.ActiveCfg = Release|Any CPU - {E2F234D6-3B2C-4F5E-B815-6D61B8AA5DC6}.Release|iPhone.Build.0 = Release|Any CPU - {E2F234D6-3B2C-4F5E-B815-6D61B8AA5DC6}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {E2F234D6-3B2C-4F5E-B815-6D61B8AA5DC6}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {E2F234D6-3B2C-4F5E-B815-6D61B8AA5DC6}.Release|x64.ActiveCfg = Release|Any CPU - {E2F234D6-3B2C-4F5E-B815-6D61B8AA5DC6}.Release|x64.Build.0 = Release|Any CPU - {E2F234D6-3B2C-4F5E-B815-6D61B8AA5DC6}.Release|x86.ActiveCfg = Release|Any CPU - {E2F234D6-3B2C-4F5E-B815-6D61B8AA5DC6}.Release|x86.Build.0 = Release|Any CPU {D4931444-94DD-49C6-8AFC-2228CDBDD5EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D4931444-94DD-49C6-8AFC-2228CDBDD5EA}.Debug|Any CPU.Build.0 = Debug|Any CPU {D4931444-94DD-49C6-8AFC-2228CDBDD5EA}.Debug|ARM.ActiveCfg = Debug|Any CPU @@ -227,62 +134,42 @@ Global {F193CE01-DF8B-4BC1-B9D5-C259455F61D6}.Release|x86.ActiveCfg = Release|Any CPU {F193CE01-DF8B-4BC1-B9D5-C259455F61D6}.Release|x86.Build.0 = Release|Any CPU {F193CE01-DF8B-4BC1-B9D5-C259455F61D6}.Release|x86.Deploy.0 = Release|Any CPU - {66CF623C-9A8E-43C3-BD26-7F97FC443914}.Debug|Any CPU.ActiveCfg = Debug|x86 - {66CF623C-9A8E-43C3-BD26-7F97FC443914}.Debug|ARM.ActiveCfg = Debug|x86 - {66CF623C-9A8E-43C3-BD26-7F97FC443914}.Debug|ARM64.ActiveCfg = Debug|arm64 - {66CF623C-9A8E-43C3-BD26-7F97FC443914}.Debug|ARM64.Build.0 = Debug|arm64 - {66CF623C-9A8E-43C3-BD26-7F97FC443914}.Debug|iPhone.ActiveCfg = Debug|x86 - {66CF623C-9A8E-43C3-BD26-7F97FC443914}.Debug|iPhoneSimulator.ActiveCfg = Debug|x86 - {66CF623C-9A8E-43C3-BD26-7F97FC443914}.Debug|x64.ActiveCfg = Debug|x64 - {66CF623C-9A8E-43C3-BD26-7F97FC443914}.Debug|x64.Build.0 = Debug|x64 - {66CF623C-9A8E-43C3-BD26-7F97FC443914}.Debug|x86.ActiveCfg = Debug|x86 - {66CF623C-9A8E-43C3-BD26-7F97FC443914}.Debug|x86.Build.0 = Debug|x86 - {66CF623C-9A8E-43C3-BD26-7F97FC443914}.Release|Any CPU.ActiveCfg = Release|x86 - {66CF623C-9A8E-43C3-BD26-7F97FC443914}.Release|ARM.ActiveCfg = Release|x86 - {66CF623C-9A8E-43C3-BD26-7F97FC443914}.Release|ARM64.ActiveCfg = Release|arm64 - {66CF623C-9A8E-43C3-BD26-7F97FC443914}.Release|ARM64.Build.0 = Release|arm64 - {66CF623C-9A8E-43C3-BD26-7F97FC443914}.Release|iPhone.ActiveCfg = Release|x86 - {66CF623C-9A8E-43C3-BD26-7F97FC443914}.Release|iPhoneSimulator.ActiveCfg = Release|x86 - {66CF623C-9A8E-43C3-BD26-7F97FC443914}.Release|x64.ActiveCfg = Release|x64 - {66CF623C-9A8E-43C3-BD26-7F97FC443914}.Release|x64.Build.0 = Release|x64 - {66CF623C-9A8E-43C3-BD26-7F97FC443914}.Release|x86.ActiveCfg = Release|x86 - {66CF623C-9A8E-43C3-BD26-7F97FC443914}.Release|x86.Build.0 = Release|x86 - {503B7824-7376-450B-9EF7-EA587DF2C8BE}.Debug|Any CPU.ActiveCfg = Debug|x86 - {503B7824-7376-450B-9EF7-EA587DF2C8BE}.Debug|ARM.ActiveCfg = Debug|x86 - {503B7824-7376-450B-9EF7-EA587DF2C8BE}.Debug|ARM64.ActiveCfg = Debug|arm64 - {503B7824-7376-450B-9EF7-EA587DF2C8BE}.Debug|ARM64.Build.0 = Debug|arm64 - {503B7824-7376-450B-9EF7-EA587DF2C8BE}.Debug|ARM64.Deploy.0 = Debug|arm64 - {503B7824-7376-450B-9EF7-EA587DF2C8BE}.Debug|iPhone.ActiveCfg = Debug|x86 - {503B7824-7376-450B-9EF7-EA587DF2C8BE}.Debug|iPhoneSimulator.ActiveCfg = Debug|x86 - {503B7824-7376-450B-9EF7-EA587DF2C8BE}.Debug|x64.ActiveCfg = Debug|x64 - {503B7824-7376-450B-9EF7-EA587DF2C8BE}.Debug|x64.Build.0 = Debug|x64 - {503B7824-7376-450B-9EF7-EA587DF2C8BE}.Debug|x64.Deploy.0 = Debug|x64 - {503B7824-7376-450B-9EF7-EA587DF2C8BE}.Debug|x86.ActiveCfg = Debug|x86 - {503B7824-7376-450B-9EF7-EA587DF2C8BE}.Debug|x86.Build.0 = Debug|x86 - {503B7824-7376-450B-9EF7-EA587DF2C8BE}.Debug|x86.Deploy.0 = Debug|x86 - {503B7824-7376-450B-9EF7-EA587DF2C8BE}.Release|Any CPU.ActiveCfg = Release|x86 - {503B7824-7376-450B-9EF7-EA587DF2C8BE}.Release|ARM.ActiveCfg = Release|x86 - {503B7824-7376-450B-9EF7-EA587DF2C8BE}.Release|ARM64.ActiveCfg = Release|arm64 - {503B7824-7376-450B-9EF7-EA587DF2C8BE}.Release|ARM64.Build.0 = Release|arm64 - {503B7824-7376-450B-9EF7-EA587DF2C8BE}.Release|ARM64.Deploy.0 = Release|arm64 - {503B7824-7376-450B-9EF7-EA587DF2C8BE}.Release|iPhone.ActiveCfg = Release|x86 - {503B7824-7376-450B-9EF7-EA587DF2C8BE}.Release|iPhoneSimulator.ActiveCfg = Release|x86 - {503B7824-7376-450B-9EF7-EA587DF2C8BE}.Release|x64.ActiveCfg = Release|x64 - {503B7824-7376-450B-9EF7-EA587DF2C8BE}.Release|x64.Build.0 = Release|x64 - {503B7824-7376-450B-9EF7-EA587DF2C8BE}.Release|x64.Deploy.0 = Release|x64 - {503B7824-7376-450B-9EF7-EA587DF2C8BE}.Release|x86.ActiveCfg = Release|x86 - {503B7824-7376-450B-9EF7-EA587DF2C8BE}.Release|x86.Build.0 = Release|x86 - {503B7824-7376-450B-9EF7-EA587DF2C8BE}.Release|x86.Deploy.0 = Release|x86 + {57F70ECE-2779-4DDC-801F-ECF819EF478B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {57F70ECE-2779-4DDC-801F-ECF819EF478B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {57F70ECE-2779-4DDC-801F-ECF819EF478B}.Debug|ARM.ActiveCfg = Debug|Any CPU + {57F70ECE-2779-4DDC-801F-ECF819EF478B}.Debug|ARM.Build.0 = Debug|Any CPU + {57F70ECE-2779-4DDC-801F-ECF819EF478B}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {57F70ECE-2779-4DDC-801F-ECF819EF478B}.Debug|ARM64.Build.0 = Debug|Any CPU + {57F70ECE-2779-4DDC-801F-ECF819EF478B}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {57F70ECE-2779-4DDC-801F-ECF819EF478B}.Debug|iPhone.Build.0 = Debug|Any CPU + {57F70ECE-2779-4DDC-801F-ECF819EF478B}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {57F70ECE-2779-4DDC-801F-ECF819EF478B}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {57F70ECE-2779-4DDC-801F-ECF819EF478B}.Debug|x64.ActiveCfg = Debug|Any CPU + {57F70ECE-2779-4DDC-801F-ECF819EF478B}.Debug|x64.Build.0 = Debug|Any CPU + {57F70ECE-2779-4DDC-801F-ECF819EF478B}.Debug|x86.ActiveCfg = Debug|Any CPU + {57F70ECE-2779-4DDC-801F-ECF819EF478B}.Debug|x86.Build.0 = Debug|Any CPU + {57F70ECE-2779-4DDC-801F-ECF819EF478B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {57F70ECE-2779-4DDC-801F-ECF819EF478B}.Release|Any CPU.Build.0 = Release|Any CPU + {57F70ECE-2779-4DDC-801F-ECF819EF478B}.Release|ARM.ActiveCfg = Release|Any CPU + {57F70ECE-2779-4DDC-801F-ECF819EF478B}.Release|ARM.Build.0 = Release|Any CPU + {57F70ECE-2779-4DDC-801F-ECF819EF478B}.Release|ARM64.ActiveCfg = Release|Any CPU + {57F70ECE-2779-4DDC-801F-ECF819EF478B}.Release|ARM64.Build.0 = Release|Any CPU + {57F70ECE-2779-4DDC-801F-ECF819EF478B}.Release|iPhone.ActiveCfg = Release|Any CPU + {57F70ECE-2779-4DDC-801F-ECF819EF478B}.Release|iPhone.Build.0 = Release|Any CPU + {57F70ECE-2779-4DDC-801F-ECF819EF478B}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {57F70ECE-2779-4DDC-801F-ECF819EF478B}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {57F70ECE-2779-4DDC-801F-ECF819EF478B}.Release|x64.ActiveCfg = Release|Any CPU + {57F70ECE-2779-4DDC-801F-ECF819EF478B}.Release|x64.Build.0 = Release|Any CPU + {57F70ECE-2779-4DDC-801F-ECF819EF478B}.Release|x86.ActiveCfg = Release|Any CPU + {57F70ECE-2779-4DDC-801F-ECF819EF478B}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {A94A318E-1F79-4AE9-9620-58D941382410} = {586C3CCB-82A5-47F0-A099-B9A31BB4EA88} {D4931444-94DD-49C6-8AFC-2228CDBDD5EA} = {C3FDCDB7-0C29-472D-A406-E2F21A4B0EAE} {F193CE01-DF8B-4BC1-B9D5-C259455F61D6} = {C3FDCDB7-0C29-472D-A406-E2F21A4B0EAE} - {66CF623C-9A8E-43C3-BD26-7F97FC443914} = {C3FDCDB7-0C29-472D-A406-E2F21A4B0EAE} - {503B7824-7376-450B-9EF7-EA587DF2C8BE} = {C3FDCDB7-0C29-472D-A406-E2F21A4B0EAE} + {57F70ECE-2779-4DDC-801F-ECF819EF478B} = {C3FDCDB7-0C29-472D-A406-E2F21A4B0EAE} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {0653DB4A-5BBE-4D78-99B2-DB1C82663246} diff --git a/Comet.nuspec b/Comet.nuspec index f0daf19b..4591e68e 100644 --- a/Comet.nuspec +++ b/Comet.nuspec @@ -53,46 +53,12 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -117,16 +83,12 @@ - - - - - - + + diff --git a/sample/Comet.Sample.WinUI (Package)/Comet.Sample.WinUI (Package).wapproj b/sample/Comet.Sample.WinUI (Package)/Comet.Sample.WinUI (Package).wapproj deleted file mode 100644 index 2d61d484..00000000 --- a/sample/Comet.Sample.WinUI (Package)/Comet.Sample.WinUI (Package).wapproj +++ /dev/null @@ -1,90 +0,0 @@ - - - - 15.0 - - - true - - - - Debug - x86 - - - Release - x86 - - - Debug - x64 - - - Release - x64 - - - Debug - arm64 - - - Release - arm64 - - - - $(MSBuildExtensionsPath)\Microsoft\DesktopBridge\ - Controls.Sample.WinUI\ - - - - 503b7824-7376-450b-9ef7-ea587df2c8be - 10.0.19041.0 - 10.0.17763.0 - en-US - false - $(MSBuildThisFileDirectory)build\ - - - - Designer - - - - - - - - - - - - - - $(NUGET_PACKAGES) - $(UserProfile)\.nuget\packages - $([MSBuild]::NormalizeDirectory('$(NuGetPackageRoot)', 'Microsoft.ProjectReunion', '$(_MicrosoftProjectReunionVersion)')) - $(SolutionDir)packages\Microsoft.ProjectReunion.$(_MicrosoftProjectReunionVersion)\ - $([MSBuild]::NormalizeDirectory('$(NuGetPackageRoot)', 'Microsoft.ProjectReunion.WinUI', '$(_MicrosoftProjectReunionVersion)')) - $(SolutionDir)packages\Microsoft.ProjectReunion.WinUI.$(_MicrosoftProjectReunionVersion)\ - $([MSBuild]::NormalizeDirectory('$(PkgMicrosoft_ProjectReunion)', 'build'))Microsoft.ProjectReunion.AppXReference.props - $([MSBuild]::NormalizeDirectory('$(PkgMicrosoft_ProjectReunion_WinUI)', 'build'))Microsoft.WinUI.AppX.targets - ..\Comet.Sample.WinUI\Comet.Sample.WinUI.csproj - - - - all - - - all - - - - - True - - - - - - \ No newline at end of file diff --git a/sample/Comet.Sample.WinUI (Package)/Images/LockScreenLogo.scale-200.png b/sample/Comet.Sample.WinUI (Package)/Images/LockScreenLogo.scale-200.png deleted file mode 100644 index 735f57ad..00000000 Binary files a/sample/Comet.Sample.WinUI (Package)/Images/LockScreenLogo.scale-200.png and /dev/null differ diff --git a/sample/Comet.Sample.WinUI (Package)/Images/SplashScreen.scale-200.png b/sample/Comet.Sample.WinUI (Package)/Images/SplashScreen.scale-200.png deleted file mode 100644 index 023e7f1f..00000000 Binary files a/sample/Comet.Sample.WinUI (Package)/Images/SplashScreen.scale-200.png and /dev/null differ diff --git a/sample/Comet.Sample.WinUI (Package)/Images/Square150x150Logo.scale-200.png b/sample/Comet.Sample.WinUI (Package)/Images/Square150x150Logo.scale-200.png deleted file mode 100644 index af49fec1..00000000 Binary files a/sample/Comet.Sample.WinUI (Package)/Images/Square150x150Logo.scale-200.png and /dev/null differ diff --git a/sample/Comet.Sample.WinUI (Package)/Images/Square44x44Logo.scale-200.png b/sample/Comet.Sample.WinUI (Package)/Images/Square44x44Logo.scale-200.png deleted file mode 100644 index ce342a2e..00000000 Binary files a/sample/Comet.Sample.WinUI (Package)/Images/Square44x44Logo.scale-200.png and /dev/null differ diff --git a/sample/Comet.Sample.WinUI (Package)/Images/Square44x44Logo.targetsize-24_altform-unplated.png b/sample/Comet.Sample.WinUI (Package)/Images/Square44x44Logo.targetsize-24_altform-unplated.png deleted file mode 100644 index f6c02ce9..00000000 Binary files a/sample/Comet.Sample.WinUI (Package)/Images/Square44x44Logo.targetsize-24_altform-unplated.png and /dev/null differ diff --git a/sample/Comet.Sample.WinUI (Package)/Images/StoreLogo.png b/sample/Comet.Sample.WinUI (Package)/Images/StoreLogo.png deleted file mode 100644 index 7385b56c..00000000 Binary files a/sample/Comet.Sample.WinUI (Package)/Images/StoreLogo.png and /dev/null differ diff --git a/sample/Comet.Sample.WinUI (Package)/Images/Wide310x150Logo.scale-200.png b/sample/Comet.Sample.WinUI (Package)/Images/Wide310x150Logo.scale-200.png deleted file mode 100644 index 288995b3..00000000 Binary files a/sample/Comet.Sample.WinUI (Package)/Images/Wide310x150Logo.scale-200.png and /dev/null differ diff --git a/sample/Comet.Sample.WinUI/App.xaml b/sample/Comet.Sample.WinUI/App.xaml deleted file mode 100644 index c4a14ef0..00000000 --- a/sample/Comet.Sample.WinUI/App.xaml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - diff --git a/sample/Comet.Sample.WinUI/App.xaml.cs b/sample/Comet.Sample.WinUI/App.xaml.cs deleted file mode 100644 index 6bb6726f..00000000 --- a/sample/Comet.Sample.WinUI/App.xaml.cs +++ /dev/null @@ -1,43 +0,0 @@ -using Comet.Samples; -using Microsoft.Maui; -using Windows.ApplicationModel; - -// To learn more about WinUI, the WinUI project structure, -// and more about our project templates, see: http://aka.ms/winui-project-info. - -namespace Maui.Controls.Sample.WinUI3 -{ - // TODO: this is not nice. - public class MiddleApp : MauiWinUIApplication - { - } - - /// - /// Provides application-specific behavior to supplement the default Application class. - /// - public partial class App : MiddleApp - { - /// - /// Initializes the singleton application object. This is the first line of authored code - /// executed, and as such is the logical equivalent of main() or WinMain(). - /// - public App() - { - InitializeComponent(); - //TODO WINUI - //Suspending += OnSuspending; - } - - /// - /// Invoked when application execution is being suspended. Application state is saved - /// without knowing whether the application will be terminated or resumed with the contents - /// of memory still intact. - /// - /// The source of the suspend request. - /// Details about the suspend request. - void OnSuspending(object sender, SuspendingEventArgs e) - { - // Save application state and stop any background activity - } - } -} \ No newline at end of file diff --git a/sample/Comet.Sample.WinUI/Comet.Sample.WinUI.csproj b/sample/Comet.Sample.WinUI/Comet.Sample.WinUI.csproj index c9d9add6..2b43150a 100644 --- a/sample/Comet.Sample.WinUI/Comet.Sample.WinUI.csproj +++ b/sample/Comet.Sample.WinUI/Comet.Sample.WinUI.csproj @@ -1,23 +1,48 @@  - - WinExe - net6.0-windows10.0.19041.0 - 10.0.17763.0 - Maui.Controls.Sample.WinUI3 - app.manifest - x86;x64;arm64 - win10-x86;win10-x64;win10-arm64 - - - - - - - - - - - - - + + + net6.0-windows10.0.19041 + win-x64 + WinExe + 10.0.17763.0 + true + true + CometSample + + + true + MSIX + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sample/Comet.Sample.WinUI/Platforms/Windows/App.xaml b/sample/Comet.Sample.WinUI/Platforms/Windows/App.xaml new file mode 100644 index 00000000..211933dd --- /dev/null +++ b/sample/Comet.Sample.WinUI/Platforms/Windows/App.xaml @@ -0,0 +1,8 @@ + + + diff --git a/sample/Comet.Sample.WinUI/Platforms/Windows/App.xaml.cs b/sample/Comet.Sample.WinUI/Platforms/Windows/App.xaml.cs new file mode 100644 index 00000000..24beccea --- /dev/null +++ b/sample/Comet.Sample.WinUI/Platforms/Windows/App.xaml.cs @@ -0,0 +1,34 @@ +using Microsoft.Maui; +using Microsoft.UI.Xaml; +using Windows.ApplicationModel; + +// To learn more about WinUI, the WinUI project structure, +// and more about our project templates, see: http://aka.ms/winui-project-info. +using Microsoft.Maui; +using Comet.Samples; +namespace MauiSample.WinUI +{ + /// + /// Provides application-specific behavior to supplement the default Application class. + /// + public partial class App : MauiWinUIApplication + { + /// + /// Initializes the singleton application object. This is the first line of authored code + /// executed, and as such is the logical equivalent of main() or WinMain(). + /// + public App() + { + this.InitializeComponent(); + } + + protected override IStartup OnCreateStartup() => new MyApp(); + + protected override void OnLaunched(LaunchActivatedEventArgs args) + { + base.OnLaunched(args); + + Microsoft.Maui.Essentials.Platform.OnLaunched(args); + } + } +} diff --git a/sample/Comet.Sample.WinUI (Package)/Package.appxmanifest b/sample/Comet.Sample.WinUI/Platforms/Windows/Package.appxmanifest similarity index 54% rename from sample/Comet.Sample.WinUI (Package)/Package.appxmanifest rename to sample/Comet.Sample.WinUI/Platforms/Windows/Package.appxmanifest index 79430c09..25b2b734 100644 --- a/sample/Comet.Sample.WinUI (Package)/Package.appxmanifest +++ b/sample/Comet.Sample.WinUI/Platforms/Windows/Package.appxmanifest @@ -7,14 +7,14 @@ IgnorableNamespaces="uap rescap"> - Maui.Comet.Sample.WinUI3 (Package) - shane - Images\StoreLogo.png + MauiSample + Microsoft + Assets\appiconStoreLogo.png @@ -31,19 +31,28 @@ Executable="$targetnametoken$.exe" EntryPoint="$targetentrypoint$"> - - + Square150x150Logo="Assets\appiconMediumTile.png" + Square44x44Logo="Assets\appiconLogo.png"> + + + + + + + - + diff --git a/sample/Comet.Sample.WinUI/app.manifest b/sample/Comet.Sample.WinUI/Platforms/Windows/app.manifest similarity index 89% rename from sample/Comet.Sample.WinUI/app.manifest rename to sample/Comet.Sample.WinUI/Platforms/Windows/app.manifest index 4974a4b0..2b32f315 100644 --- a/sample/Comet.Sample.WinUI/app.manifest +++ b/sample/Comet.Sample.WinUI/Platforms/Windows/app.manifest @@ -1,6 +1,6 @@ - + diff --git a/sample/Comet.Sample.WinUI/Properties/launchSettings.json b/sample/Comet.Sample.WinUI/Properties/launchSettings.json new file mode 100644 index 00000000..3160709a --- /dev/null +++ b/sample/Comet.Sample.WinUI/Properties/launchSettings.json @@ -0,0 +1,7 @@ +{ + "profiles": { + "MauiSample.WinUI": { + "commandName": "AppContainer" + } + } +} \ No newline at end of file diff --git a/src/Comet/Binding.cs b/src/Comet/Binding.cs index 71c89d7d..c08eb6f7 100644 --- a/src/Comet/Binding.cs +++ b/src/Comet/Binding.cs @@ -234,7 +234,8 @@ namespace Comet View?.ViewPropertyChanged(propertyName, CurrentValue); } - T Cast(object value) + + static T Cast(object value) { if (value is T v) return v; diff --git a/src/Comet/Handlers/ListView/ListViewHandler.Windows.cs b/src/Comet/Handlers/ListView/ListViewHandler.Windows.cs new file mode 100644 index 00000000..b55547f6 --- /dev/null +++ b/src/Comet/Handlers/ListView/ListViewHandler.Windows.cs @@ -0,0 +1,76 @@ +using System; +using Microsoft.Maui.Handlers; +using Microsoft.Maui; +using UWPListView = Microsoft.UI.Xaml.Controls.ListView; + +namespace Comet.Handlers +{ + public partial class ListViewHandler : ViewHandler + { + + + public static void MapListViewProperty(IElementHandler viewHandler, IListView virtualView) + { + setupView(viewHandler, virtualView); + } + + static void setupView(IElementHandler viewHandler, IListView virtualView) + { + //var nativeView = (UWPListView)viewHandler.NativeView; + //var sections = virtualView?.Sections() ?? 0; + //for (var s = 0; s < sections; s++) + //{ + // var section = virtualView?.HeaderFor(s); + // if (section != null) + // nativeView.Items?.Add(new ListViewHandlerItem((ListViewHandler)viewHandler, section)); + + // var rows = virtualView.Rows(s); + // for (var r = 0; r < rows; r++) + // { + // var v = virtualView.ViewFor(s, r); + // nativeView.Items?.Add(new ListViewHandlerItem((ListViewHandler)viewHandler, v)); + // } + // var footer = virtualView?.FooterFor(s); + // if (footer != null) + // nativeView.Items?.Add(new ListViewHandlerItem((ListViewHandler)viewHandler, footer)); + //} + } + + public static void MapReloadData(IElementHandler viewHandler, IListView virtualView) + { + var nativeView = (UWPListView)viewHandler.NativeView; + nativeView.Items.Clear(); + setupView(viewHandler, virtualView); + } + + protected override UWPListView CreateNativeView() + { + var listView = new UWPListView(); + listView.SelectionChanged += ListView_SelectionChanged; + return listView; + } + + private void ListView_SelectionChanged(object sender, Microsoft.UI.Xaml.Controls.SelectionChangedEventArgs e) + { + + VirtualView?.OnSelected(0, NativeView.SelectedIndex); + } + //public class ListViewHandlerItem : ListViewItem + //{ + // public ListViewHandlerItem(ListViewHandler handler, View view) + // { + // RemoveViewHandlers(view); + // var nativeView = new IListCell(view); + // Content = nativeView; + // } + + // private void RemoveViewHandlers(View view) + // { + // view.ViewHandler = null; + // if (view is AbstractLayout layout) + // foreach (var subview in layout) + // RemoveViewHandlers(subview); + // } + //} + } +} diff --git a/src/Comet/Handlers/Navigation/NavigationViewHandler.Windows.cs b/src/Comet/Handlers/Navigation/NavigationViewHandler.Windows.cs new file mode 100644 index 00000000..ebe7ce9c --- /dev/null +++ b/src/Comet/Handlers/Navigation/NavigationViewHandler.Windows.cs @@ -0,0 +1,13 @@ +using System; +using Microsoft.Maui.Handlers; +using Microsoft.Maui; +using Microsoft.UI.Xaml.Controls; + +namespace Comet.Handlers +{ + public partial class NavigationViewHandler : ViewHandler + { + protected override Panel CreateNativeView() => new LayoutPanel(); + + } +} diff --git a/src/Comet/Handlers/ScrollView/ScrollViewHandler.Windows.cs b/src/Comet/Handlers/ScrollView/ScrollViewHandler.Windows.cs new file mode 100644 index 00000000..0d9bb66f --- /dev/null +++ b/src/Comet/Handlers/ScrollView/ScrollViewHandler.Windows.cs @@ -0,0 +1,13 @@ +using System; +using Microsoft.Maui.Handlers; +using Microsoft.Maui; +using UWPScrollView = Microsoft.UI.Xaml.Controls.ScrollViewer; + +namespace Comet.Handlers +{ + public partial class ScrollViewHandler : ViewHandler + { + protected override UWPScrollView CreateNativeView() => new UWPScrollView(); + + } +} diff --git a/src/Comet/Handlers/ShapeView/ShapeViewHandler.Windows.cs b/src/Comet/Handlers/ShapeView/ShapeViewHandler.Windows.cs new file mode 100644 index 00000000..3a8297a9 --- /dev/null +++ b/src/Comet/Handlers/ShapeView/ShapeViewHandler.Windows.cs @@ -0,0 +1,20 @@ +using System; +using Microsoft.Maui.Handlers; +//using Microsoft.Maui.Graphics.Native; +using Microsoft.Maui; +using Microsoft.UI.Xaml.Controls; + +namespace Comet.Handlers +{ + public partial class ShapeViewHandler : ViewHandler + { + protected override Panel CreateNativeView() => new LayoutPanel(); + + + public static void MapShapeProperty(IElementHandler viewHandler, ShapeView virtualView) + { + //var nativeView = (NativeGraphicsView)viewHandler.NativeView; + //nativeView.Drawable = virtualView; + } + } +} diff --git a/src/Comet/Handlers/Spacer/SpacerHandler.cs b/src/Comet/Handlers/Spacer/SpacerHandler.cs index 43f8fcfc..47178ab1 100644 --- a/src/Comet/Handlers/Spacer/SpacerHandler.cs +++ b/src/Comet/Handlers/Spacer/SpacerHandler.cs @@ -7,6 +7,9 @@ using Microsoft.Maui.Handlers; using NativeView = UIKit.UIView; #elif MONOANDROID using NativeView = Android.Views.View; +#elif WINDOWS +using NativeView = Microsoft.UI.Xaml.Controls.Panel; + #else using NativeView = System.Object; #endif @@ -21,10 +24,12 @@ namespace Comet.Handlers { } - + protected override NativeView CreateNativeView() => #if MONOANDROID new NativeView(Context.ApplicationContext); +#elif WINDOWS + new LayoutPanel(); #else new NativeView(); #endif diff --git a/src/Comet/Handlers/TabView/TabViewHandler.Windows.cs b/src/Comet/Handlers/TabView/TabViewHandler.Windows.cs new file mode 100644 index 00000000..f7587ddf --- /dev/null +++ b/src/Comet/Handlers/TabView/TabViewHandler.Windows.cs @@ -0,0 +1,22 @@ +using System; +using System.Linq; +using Microsoft.Maui; +using Microsoft.Maui.Handlers; +using Microsoft.UI.Xaml; +using Microsoft.UI.Xaml.Controls; + + +namespace Comet.Handlers +{ + public partial class TabViewHandler : ViewHandler + { + //public override bool IgnoreSafeArea => VirtualView?.GetIgnoreSafeArea(true) ?? true; + protected override Panel CreateNativeView() => NativeView ?? new LayoutPanel { }; + + + public static void MapChildren(TabViewHandler handler, TabView tabView) + { + //handler?.NativeView?.Setup(tabView?.ToList()); + } + } +} diff --git a/src/Comet/Platform/Windows/ListCell.cs b/src/Comet/Platform/Windows/ListCell.cs new file mode 100644 index 00000000..ea089817 --- /dev/null +++ b/src/Comet/Platform/Windows/ListCell.cs @@ -0,0 +1,96 @@ +//using System; +//using System.Collections.Generic; +//using System.Linq; +//using System.Text; +//using System.Threading.Tasks; +//using Microsoft.Maui; +//using Microsoft.UI.Xaml; +//using Microsoft.UI.Xaml.Controls; +//using WGrid = Microsoft.UI.Xaml.Controls.Grid; +//using UwpSize = Windows.Foundation.Size; + +//namespace Comet.Platform.Windows +//{ +// class ListCell : WGrid +// { +// private View _view; +// private UIElement _nativeView; +// private IViewHandler _handler; + +// public ListCell(View view = null) +// { +// View = view; +// } + +// public View View +// { +// get => _view; +// set +// { +// if (value == _view) +// return; + +// if (_handler is ViewHandler oldViewHandler) +// oldViewHandler.NativeViewChanged -= HandleNativeViewChanged; + +// if (_view != null) +// _view.NeedsLayout -= LayoutChanged; + +// _view = value; +// _handler = _view?.ViewHandler; + +// if (_view != null) +// _view.NeedsLayout += LayoutChanged; + +// if (_handler is ViewHandler newViewHandler) +// newViewHandler.NativeViewChanged += HandleNativeViewChanged; + +// HandleNativeViewChanged(this, null); +// } +// } + +// private void LayoutChanged(object sender, EventArgs e) +// { +// InvalidateMeasure(); +// InvalidateArrange(); +// } + +// private void HandleNativeViewChanged(object sender, ViewChangedEventArgs e) +// { +// if (_nativeView != null) +// { +// Children.Remove(_nativeView); +// _nativeView = null; +// } + +// _nativeView = _view?.ToView(); + +// if (_nativeView != null) +// { +// if (_nativeView is FrameworkElement frameworkElement) +// { +// WGrid.SetRow(frameworkElement, 0); +// WGrid.SetColumn(frameworkElement, 0); +// WGrid.SetColumnSpan(frameworkElement, 1); +// WGrid.SetRowSpan(frameworkElement, 1); +// } + +// Children.Add(_nativeView); +// } +// } + +// protected override UwpSize MeasureOverride(UwpSize availableSize) +// { +// var measuredSize = _view?.Measure(availableSize.ToSizeF()).ToWSize(); +// return measuredSize ?? availableSize; +// } + +// protected override UwpSize ArrangeOverride(UwpSize finalSize) +// { +// if (finalSize.Width > 0 && finalSize.Height > 0 && _view != null) +// _view.Frame = new RectangleF(0, 0, (float)finalSize.Width, (float)finalSize.Height); + +// return finalSize; +// } +// } +//}