Windows now builds properly. Sample still needs updating
This commit is contained in:
James Clancey
Родитель
46ef861623
Коммит
73af83d5cc
175
Comet.WinUI.sln
175
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}
|
||||
|
|
|
|||
46
Comet.nuspec
46
Comet.nuspec
|
|
@ -53,46 +53,12 @@
|
|||
<dependency id="Reloadify3000" version="1.0.6" />
|
||||
</group>
|
||||
<group targetFramework="net6.0-android30.0">
|
||||
<dependency id="Microsoft.Maui.Graphics" version="6.0.100-preview.4.134" exclude="Build,Analyzers" />
|
||||
<dependency id="Xamarin.AndroidX.Legacy.Support.V4" version="1.0.0.7-net6preview03.4680155" exclude="Build,Analyzers" />
|
||||
<dependency id="Xamarin.AndroidX.Lifecycle.LiveData" version="2.3.1-net6preview03.4680155" exclude="Build,Analyzers" />
|
||||
<dependency id="Xamarin.AndroidX.Navigation.Common" version="2.3.5-net6preview03.4680155" exclude="Build,Analyzers" />
|
||||
<dependency id="Xamarin.AndroidX.Navigation.Fragment" version="2.3.5-net6preview03.4680155" exclude="Build,Analyzers" />
|
||||
<dependency id="Xamarin.AndroidX.Navigation.Runtime" version="2.3.5-net6preview03.4680155" exclude="Build,Analyzers" />
|
||||
<dependency id="Xamarin.AndroidX.Navigation.UI" version="2.3.5-net6preview03.4680155" exclude="Build,Analyzers" />
|
||||
<dependency id="Xamarin.Google.Android.Material" version="1.3.0.1-net6preview03.4680155" exclude="Build,Analyzers" />
|
||||
<dependency id="Xamarin.Android.Glide" version="4.12.0" />
|
||||
<dependency id="Xamarin.AndroidX.Browser" version="1.3.0.5" />
|
||||
<dependency id="Microsoft.Extensions.Configuration" version="6.0.0-preview.4.21253.7" exclude="Build,Analyzers" />
|
||||
<dependency id="Microsoft.Extensions.DependencyInjection" version="6.0.0-preview.4.21253.7" exclude="Build,Analyzers" />
|
||||
<dependency id="Microsoft.Extensions.Hosting.Abstractions" version="6.0.0-preview.4.21253.7" exclude="Build,Analyzers" />
|
||||
<dependency id="Microsoft.Extensions.Logging.Abstractions" version="6.0.0-preview.4.21253.7" exclude="Build,Analyzers" />
|
||||
<dependency id="Microsoft.Maui.Essentials" version="6.0.100-preview.4.631" exclude="Build,Analyzers" />
|
||||
<dependency id="Microsoft.Maui.Resizetizer" version="6.0.100-preview.4.631" exclude="Build,Analyzers" />
|
||||
<dependency id="Microsoft.Maui.Controls.Build.Tasks" version="6.0.100-preview.4.634" />
|
||||
<dependency id="Reloadify3000" version="1.0.6" />
|
||||
</group>
|
||||
<group targetFramework="net6.0-ios13.6">
|
||||
<dependency id="Microsoft.Maui.Graphics" version="6.0.100-preview.4.134" exclude="Build,Analyzers" />
|
||||
<dependency id="Microsoft.Extensions.Configuration" version="6.0.0-preview.4.21253.7" exclude="Build,Analyzers" />
|
||||
<dependency id="Microsoft.Extensions.DependencyInjection" version="6.0.0-preview.4.21253.7" exclude="Build,Analyzers" />
|
||||
<dependency id="Microsoft.Extensions.Hosting.Abstractions" version="6.0.0-preview.4.21253.7" exclude="Build,Analyzers" />
|
||||
<dependency id="Microsoft.Extensions.Logging.Abstractions" version="6.0.0-preview.4.21253.7" exclude="Build,Analyzers" />
|
||||
<dependency id="Microsoft.Maui.Essentials" version="6.0.100-preview.4.631" exclude="Build,Analyzers" />
|
||||
<dependency id="Microsoft.Maui.Resizetizer" version="6.0.100-preview.4.631" exclude="Build,Analyzers" />
|
||||
<dependency id="Microsoft.Maui.Controls.Build.Tasks" version="6.0.100-preview.4.634" />
|
||||
<dependency id="Reloadify3000" version="1.0.6" />
|
||||
</group>
|
||||
<group targetFramework="net6.0-maccatalyst13.5">
|
||||
<dependency id="Microsoft.Maui.Graphics" version="6.0.100-preview.4.134" exclude="Build,Analyzers" />
|
||||
<dependency id="Microsoft.Extensions.Configuration" version="6.0.0-preview.4.21253.7" exclude="Build,Analyzers" />
|
||||
<dependency id="Microsoft.Extensions.DependencyInjection" version="6.0.0-preview.4.21253.7" exclude="Build,Analyzers" />
|
||||
<dependency id="Microsoft.Extensions.Hosting.Abstractions" version="6.0.0-preview.4.21253.7" exclude="Build,Analyzers" />
|
||||
<dependency id="Microsoft.Extensions.Logging.Abstractions" version="6.0.0-preview.4.21253.7" exclude="Build,Analyzers" />
|
||||
<dependency id="Microsoft.Maui.Essentials" version="6.0.100-preview.4.631" exclude="Build,Analyzers" />
|
||||
<dependency id="Microsoft.Maui.Resizetizer" version="6.0.100-preview.4.631" exclude="Build,Analyzers" />
|
||||
<dependency id="Microsoft.Maui.Controls.Build.Tasks" version="6.0.100-preview.4.634" />
|
||||
<dependency id="Reloadify3000" version="1.0.6" />
|
||||
</group>
|
||||
<group targetFramework="net6.0-windows10.0.18362">
|
||||
</group>
|
||||
</dependencies>
|
||||
</metadata>
|
||||
|
|
@ -117,16 +83,12 @@
|
|||
<file src="src/Comet/bin/Debug/monoandroid10.0/Microsoft.Maui.Essentials.pdb" target="lib/monoandroid10/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-ios/Microsoft.Maui.dll" target="lib/net6.0-ios13.6/Microsoft.Maui.dll"/>
|
||||
<file src="src/Comet/bin/Debug/net6.0-ios/Microsoft.Maui.pdb" target="lib/net6.0-ios13.6/Microsoft.Maui.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-android/Microsoft.Maui.dll" target="lib/net6.0-android30.0/Microsoft.Maui.dll"/>
|
||||
<file src="src/Comet/bin/Debug/net6.0-android/Microsoft.Maui.pdb" target="lib/net6.0-android30.0/Microsoft.Maui.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-maccatalyst/Microsoft.Maui.dll" target="lib/net6.0-maccatalyst13.5/Microsoft.Maui.dll"/>
|
||||
<file src="src/Comet/bin/Debug/net6.0-maccatalyst/Microsoft.Maui.pdb" target="lib/net6.0-maccatalyst13.5/Microsoft.Maui.pdb"/>
|
||||
<file src="src/Comet/bin/Debug/net6.0-windows10.0.18362/Comet.dll" target="lib/net6.0-windows10.0.18362/Comet.dll"/>
|
||||
<file src="src/Comet/bin/Debug/net6.0-windows10.0.18362/Comet.pdb" target="lib/net6.0-windows10.0.18362/Comet.pdb"/>
|
||||
<file src="external/Maui/.nuspec/Microsoft.Maui.Core.targets" target="build/Microsoft.Maui.Core.targets" />
|
||||
<file src="external/Maui/.nuspec/Microsoft.Maui.Core.props" target="build/Microsoft.Maui.Core.props" />
|
||||
</files>
|
||||
|
|
|
|||
|
|
@ -1,90 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup Condition="'$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' < '15.0'">
|
||||
<VisualStudioVersion>15.0</VisualStudioVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<SkipImportNetSdk>true</SkipImportNetSdk>
|
||||
</PropertyGroup>
|
||||
<ItemGroup Label="ProjectConfigurations">
|
||||
<ProjectConfiguration Include="Debug|x86">
|
||||
<Configuration>Debug</Configuration>
|
||||
<Platform>x86</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Release|x86">
|
||||
<Configuration>Release</Configuration>
|
||||
<Platform>x86</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Debug|x64">
|
||||
<Configuration>Debug</Configuration>
|
||||
<Platform>x64</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Release|x64">
|
||||
<Configuration>Release</Configuration>
|
||||
<Platform>x64</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Debug|arm64">
|
||||
<Configuration>Debug</Configuration>
|
||||
<Platform>arm64</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Release|arm64">
|
||||
<Configuration>Release</Configuration>
|
||||
<Platform>arm64</Platform>
|
||||
</ProjectConfiguration>
|
||||
</ItemGroup>
|
||||
<PropertyGroup>
|
||||
<WapProjPath Condition="'$(WapProjPath)'==''">$(MSBuildExtensionsPath)\Microsoft\DesktopBridge\</WapProjPath>
|
||||
<PathToXAMLWinRTImplementations>Controls.Sample.WinUI\</PathToXAMLWinRTImplementations>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(WapProjPath)\Microsoft.DesktopBridge.props" />
|
||||
<PropertyGroup>
|
||||
<ProjectGuid>503b7824-7376-450b-9ef7-ea587df2c8be</ProjectGuid>
|
||||
<TargetPlatformVersion>10.0.19041.0</TargetPlatformVersion>
|
||||
<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
|
||||
<DefaultLanguage>en-US</DefaultLanguage>
|
||||
<AppxPackageSigningEnabled>false</AppxPackageSigningEnabled>
|
||||
<AppxTargetsLocation Condition="'$(AppxTargetsLocation)'==''">$(MSBuildThisFileDirectory)build\</AppxTargetsLocation>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<AppxManifest Include="Package.appxmanifest">
|
||||
<SubType>Designer</SubType>
|
||||
</AppxManifest>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Content Include="Images\SplashScreen.scale-200.png" />
|
||||
<Content Include="Images\LockScreenLogo.scale-200.png" />
|
||||
<Content Include="Images\Square150x150Logo.scale-200.png" />
|
||||
<Content Include="Images\Square44x44Logo.scale-200.png" />
|
||||
<Content Include="Images\Square44x44Logo.targetsize-24_altform-unplated.png" />
|
||||
<Content Include="Images\StoreLogo.png" />
|
||||
<Content Include="Images\Wide310x150Logo.scale-200.png" />
|
||||
</ItemGroup>
|
||||
<PropertyGroup>
|
||||
<!--PackageReference.GeneratePathProperty does not support NUGET_PACKAGES env var...-->
|
||||
<NuGetPackageRoot Condition="'$(NuGetPackageRoot)'==''">$(NUGET_PACKAGES)</NuGetPackageRoot>
|
||||
<NuGetPackageRoot Condition="'$(NuGetPackageRoot)'==''">$(UserProfile)\.nuget\packages</NuGetPackageRoot>
|
||||
<PkgMicrosoft_ProjectReunion Condition="'$(PkgMicrosoft_ProjectReunion)'==''">$([MSBuild]::NormalizeDirectory('$(NuGetPackageRoot)', 'Microsoft.ProjectReunion', '$(_MicrosoftProjectReunionVersion)'))</PkgMicrosoft_ProjectReunion>
|
||||
<PkgMicrosoft_ProjectReunion Condition="!Exists($(PkgMicrosoft_ProjectReunion))">$(SolutionDir)packages\Microsoft.ProjectReunion.$(_MicrosoftProjectReunionVersion)\</PkgMicrosoft_ProjectReunion>
|
||||
<PkgMicrosoft_ProjectReunion_WinUI Condition="'$(PkgMicrosoft_ProjectReunion_WinUI)'==''">$([MSBuild]::NormalizeDirectory('$(NuGetPackageRoot)', 'Microsoft.ProjectReunion.WinUI', '$(_MicrosoftProjectReunionVersion)'))</PkgMicrosoft_ProjectReunion_WinUI>
|
||||
<PkgMicrosoft_ProjectReunion_WinUI Condition="!Exists($(PkgMicrosoft_ProjectReunion_WinUI))">$(SolutionDir)packages\Microsoft.ProjectReunion.WinUI.$(_MicrosoftProjectReunionVersion)\</PkgMicrosoft_ProjectReunion_WinUI>
|
||||
<Microsoft_ProjectReunion_AppXReference_props>$([MSBuild]::NormalizeDirectory('$(PkgMicrosoft_ProjectReunion)', 'build'))Microsoft.ProjectReunion.AppXReference.props</Microsoft_ProjectReunion_AppXReference_props>
|
||||
<Microsoft_WinUI_AppX_targets>$([MSBuild]::NormalizeDirectory('$(PkgMicrosoft_ProjectReunion_WinUI)', 'build'))Microsoft.WinUI.AppX.targets</Microsoft_WinUI_AppX_targets>
|
||||
<EntryPointProjectUniqueName>..\Comet.Sample.WinUI\Comet.Sample.WinUI.csproj</EntryPointProjectUniqueName>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.ProjectReunion" Version="[$(_MicrosoftProjectReunionVersion)]" GeneratePathProperty="true">
|
||||
<ExcludeAssets>all</ExcludeAssets>
|
||||
</PackageReference>
|
||||
<PackageReference Include="Microsoft.ProjectReunion.WinUI" Version="[$(_MicrosoftProjectReunionVersion)]" GeneratePathProperty="true">
|
||||
<ExcludeAssets>all</ExcludeAssets>
|
||||
</PackageReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\Comet.Sample.WinUI\Comet.Sample.WinUI.csproj">
|
||||
<SkipGetTargetFrameworkProperties>True</SkipGetTargetFrameworkProperties>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<Import Project="$(WapProjPath)\Microsoft.DesktopBridge.targets" />
|
||||
<Import Project="$(Microsoft_ProjectReunion_AppXReference_props)" />
|
||||
<Import Project="$(Microsoft_WinUI_AppX_targets)" />
|
||||
</Project>
|
||||
Двоичный файл не отображается.
|
До Ширина: | Высота: | Размер: 1.4 KiB |
Двоичный файл не отображается.
|
До Ширина: | Высота: | Размер: 7.5 KiB |
Двоичный файл не отображается.
|
До Ширина: | Высота: | Размер: 2.9 KiB |
Двоичный файл не отображается.
|
До Ширина: | Высота: | Размер: 1.6 KiB |
Двоичный файл не отображается.
|
До Ширина: | Высота: | Размер: 1.2 KiB |
Двоичные данные
sample/Comet.Sample.WinUI (Package)/Images/StoreLogo.png
Двоичные данные
sample/Comet.Sample.WinUI (Package)/Images/StoreLogo.png
Двоичный файл не отображается.
|
До Ширина: | Высота: | Размер: 1.4 KiB |
Двоичный файл не отображается.
|
До Ширина: | Высота: | Размер: 3.1 KiB |
|
|
@ -1,16 +0,0 @@
|
|||
<local:MiddleApp
|
||||
xmlns:maui="using:Microsoft.Maui"
|
||||
x:Class="Maui.Controls.Sample.WinUI3.App"
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:local="using:Maui.Controls.Sample.WinUI3">
|
||||
<Application.Resources>
|
||||
<ResourceDictionary>
|
||||
<ResourceDictionary.MergedDictionaries>
|
||||
<XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" />
|
||||
<!-- Other merged dictionaries here -->
|
||||
</ResourceDictionary.MergedDictionaries>
|
||||
<!-- Other app resources here -->
|
||||
</ResourceDictionary>
|
||||
</Application.Resources>
|
||||
</local:MiddleApp>
|
||||
|
|
@ -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<MyApp>
|
||||
{
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Provides application-specific behavior to supplement the default Application class.
|
||||
/// </summary>
|
||||
public partial class App : MiddleApp
|
||||
{
|
||||
/// <summary>
|
||||
/// 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().
|
||||
/// </summary>
|
||||
public App()
|
||||
{
|
||||
InitializeComponent();
|
||||
//TODO WINUI
|
||||
//Suspending += OnSuspending;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 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.
|
||||
/// </summary>
|
||||
/// <param name="sender">The source of the suspend request.</param>
|
||||
/// <param name="e">Details about the suspend request.</param>
|
||||
void OnSuspending(object sender, SuspendingEventArgs e)
|
||||
{
|
||||
// Save application state and stop any background activity
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,23 +1,48 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
<PropertyGroup>
|
||||
<OutputType>WinExe</OutputType>
|
||||
<TargetFramework>net6.0-windows10.0.19041.0</TargetFramework>
|
||||
<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
|
||||
<RootNamespace>Maui.Controls.Sample.WinUI3</RootNamespace>
|
||||
<ApplicationManifest>app.manifest</ApplicationManifest>
|
||||
<Platforms>x86;x64;arm64</Platforms>
|
||||
<RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.ProjectReunion" />
|
||||
<PackageReference Include="Microsoft.ProjectReunion.Foundation" />
|
||||
<PackageReference Include="Microsoft.ProjectReunion.WinUI" />
|
||||
<Manifest Include="$(ApplicationManifest)" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\..\external\Maui\src\Core\src\Core-net6.csproj" />
|
||||
<ProjectReference Include="..\..\external\Maui\src\Essentials\src\Essentials-net6.csproj" />
|
||||
<ProjectReference Include="..\..\src\Comet\Comet-net6.csproj" />
|
||||
<ProjectReference Include="..\Comet.Samples\Comet.Samples-net6.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFrameworks>net6.0-windows10.0.19041</TargetFrameworks>
|
||||
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
|
||||
<OutputType>WinExe</OutputType>
|
||||
<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
|
||||
<UseMaui>true</UseMaui>
|
||||
<SingleProject>true</SingleProject>
|
||||
<RootNamespace>CometSample</RootNamespace>
|
||||
|
||||
<!-- Required - Enable Single Project for WinUI -->
|
||||
<EnablePreviewMsixTooling>true</EnablePreviewMsixTooling>
|
||||
<WindowsPackageType>MSIX</WindowsPackageType>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<!-- App Icon -->
|
||||
<MauiImage Include="..\Comet.SingleProject.Sample\Resources\appicon.svg" Link="Resources\appicon.svg" ForegroundFile="..\Comet.SingleProject.Sample\Resources\appiconfg.svg" IsAppIcon="true" Color="#512BD4" />
|
||||
|
||||
<!-- Splash Screen -->
|
||||
<MauiSplashScreen Include="..\Comet.SingleProject.Sample\Resources\appiconfg.svg" Link="Resources\appiconfg.svg" Color="#512BD4" />
|
||||
|
||||
<!-- Images -->
|
||||
<MauiImage Include="..\Comet.SingleProject.Sample\Resources\Images\*" Link="Resources\Images\%(Filename)%(Extension)" />
|
||||
|
||||
<!-- Custom Fonts -->
|
||||
<MauiFont Include="..\Comet.SingleProject.Sample\Resources\Fonts\*" Link="Resources\Fonts\%(Filename)%(Extension)" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Compile Include="..\Comet.SingleProject.Sample\**\*.cs" Exclude="..\Comet.SingleProject.Sample\bin\**;..\Comet.SingleProject.Sample\obj\**;..\Comet.SingleProject.Sample\Platforms\**" Link="%(RecursiveDir)%(Filename)%(Extension)" />
|
||||
<MauiXaml Include="..\Comet.SingleProject.Sample\**\*.xaml" Exclude="..\Comet.SingleProject.Sample\bin\**;..\Comet.SingleProject.Sample\obj\**" Link="%(RecursiveDir)%(FileName)%(Extension)" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.ProjectReunion" Version="0.8.0" />
|
||||
<PackageReference Include="Microsoft.ProjectReunion.Foundation" Version="0.8.0" />
|
||||
<PackageReference Include="Microsoft.ProjectReunion.WinUI" Version="0.8.0" />
|
||||
<PackageReference Include="Microsoft.ProjectReunion.InteractiveExperiences" Version="0.8.0" NoWarn="NU1701" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\..\src\Comet\Comet-net6.csproj" />
|
||||
<ProjectReference Include="..\Comet.Samples\Comet.Samples-net6.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,8 @@
|
|||
<maui:MauiWinUIApplication
|
||||
x:Class="MauiSample.WinUI.App"
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:maui="using:Microsoft.Maui"
|
||||
xmlns:local="using:MauiSample.WinUI">
|
||||
|
||||
</maui:MauiWinUIApplication>
|
||||
|
|
@ -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
|
||||
{
|
||||
/// <summary>
|
||||
/// Provides application-specific behavior to supplement the default Application class.
|
||||
/// </summary>
|
||||
public partial class App : MauiWinUIApplication
|
||||
{
|
||||
/// <summary>
|
||||
/// 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().
|
||||
/// </summary>
|
||||
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);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -7,14 +7,14 @@
|
|||
IgnorableNamespaces="uap rescap">
|
||||
|
||||
<Identity
|
||||
Name="16d22843-fa2c-4cfb-9d79-176fce2a90a8"
|
||||
Publisher="CN=shane"
|
||||
Name="3668E771-9016-4394-B30B-330C40A89D31"
|
||||
Publisher="CN=User Name"
|
||||
Version="1.0.0.0" />
|
||||
|
||||
<Properties>
|
||||
<DisplayName>Maui.Comet.Sample.WinUI3 (Package)</DisplayName>
|
||||
<PublisherDisplayName>shane</PublisherDisplayName>
|
||||
<Logo>Images\StoreLogo.png</Logo>
|
||||
<DisplayName>MauiSample</DisplayName>
|
||||
<PublisherDisplayName>Microsoft</PublisherDisplayName>
|
||||
<Logo>Assets\appiconStoreLogo.png</Logo>
|
||||
</Properties>
|
||||
|
||||
<Dependencies>
|
||||
|
|
@ -31,19 +31,28 @@
|
|||
Executable="$targetnametoken$.exe"
|
||||
EntryPoint="$targetentrypoint$">
|
||||
<uap:VisualElements
|
||||
DisplayName="Maui.Comet.Sample.WinUI3 (Package)"
|
||||
Description="Maui.Comet.Sample.WinUI3 (Package)"
|
||||
DisplayName="MauiSample"
|
||||
Description="MauiSample"
|
||||
BackgroundColor="transparent"
|
||||
Square150x150Logo="Images\Square150x150Logo.png"
|
||||
Square44x44Logo="Images\Square44x44Logo.png">
|
||||
<uap:DefaultTile Wide310x150Logo="Images\Wide310x150Logo.png" />
|
||||
<uap:SplashScreen Image="Images\SplashScreen.png" />
|
||||
Square150x150Logo="Assets\appiconMediumTile.png"
|
||||
Square44x44Logo="Assets\appiconLogo.png">
|
||||
<uap:DefaultTile
|
||||
Wide310x150Logo="Assets\appiconWideTile.png"
|
||||
Square71x71Logo="Assets\appiconSmallTile.png"
|
||||
Square310x310Logo="Assets\appiconLargeTile.png"
|
||||
ShortName="MauiSample">
|
||||
<uap:ShowNameOnTiles>
|
||||
<uap:ShowOn Tile="square150x150Logo"/>
|
||||
<uap:ShowOn Tile="wide310x150Logo"/>
|
||||
</uap:ShowNameOnTiles>
|
||||
</uap:DefaultTile >
|
||||
<uap:SplashScreen Image="Assets\appiconfgSplashScreen.png" />
|
||||
</uap:VisualElements>
|
||||
</Application>
|
||||
</Applications>
|
||||
|
||||
<Capabilities>
|
||||
<rescap:Capability Name="runFullTrust" />
|
||||
<DeviceCapability Name="location"/>
|
||||
</Capabilities>
|
||||
|
||||
</Package>
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
|
||||
<assemblyIdentity version="1.0.0.0" name="Maui.Controls.Sample.WinUI3.app"/>
|
||||
<assemblyIdentity version="1.0.0.0" name="MauiSample.WinUI.app"/>
|
||||
|
||||
<application xmlns="urn:schemas-microsoft-com:asm.v3">
|
||||
<windowsSettings>
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
{
|
||||
"profiles": {
|
||||
"MauiSample.WinUI": {
|
||||
"commandName": "AppContainer"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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<IListView, UWPListView>
|
||||
{
|
||||
|
||||
|
||||
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);
|
||||
// }
|
||||
//}
|
||||
}
|
||||
}
|
||||
|
|
@ -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<ScrollView, Panel>
|
||||
{
|
||||
protected override Panel CreateNativeView() => new LayoutPanel();
|
||||
|
||||
}
|
||||
}
|
||||
|
|
@ -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<ScrollView, UWPScrollView>
|
||||
{
|
||||
protected override UWPScrollView CreateNativeView() => new UWPScrollView();
|
||||
|
||||
}
|
||||
}
|
||||
|
|
@ -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<ShapeView, Panel>
|
||||
{
|
||||
protected override Panel CreateNativeView() => new LayoutPanel();
|
||||
|
||||
|
||||
public static void MapShapeProperty(IElementHandler viewHandler, ShapeView virtualView)
|
||||
{
|
||||
//var nativeView = (NativeGraphicsView)viewHandler.NativeView;
|
||||
//nativeView.Drawable = virtualView;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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<TabView, Panel>
|
||||
{
|
||||
//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());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -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;
|
||||
// }
|
||||
// }
|
||||
//}
|
||||
Загрузка…
Ссылка в новой задаче