Merge pull request #270 from dotnet/dev

Updated to run with Stable Maui
This commit is contained in:
James Clancey 2022-09-30 09:18:07 -08:00 коммит произвёл GitHub
Родитель 3f918f4e53 74ed5f448c
Коммит 4716ad7555
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
14 изменённых файлов: 363 добавлений и 167 удалений

8
.github/workflows/dev.yml поставляемый
Просмотреть файл

@ -33,7 +33,7 @@ jobs:
run: |
$ProgressPreference = 'SilentlyContinue'
Invoke-WebRequest -Uri "https://dot.net/v1/dotnet-install.ps1" -OutFile dotnet-install.ps1
& .\dotnet-install.ps1 -Quality daily -Channel 6.0.3xx -InstallDir "$env:ProgramFiles\dotnet\" -Verbose
& .\dotnet-install.ps1 -InstallDir "$env:ProgramFiles\dotnet\" -Verbose
& dotnet --list-sdks
# - name: Install Visual Studio Preview
@ -48,12 +48,10 @@ jobs:
- name: Install Maui Workload
shell: pwsh
run: |
& dotnet workload install maui
& dotnet workload install maui `
--skip-sign-check `
# - name: Set Maui Version
# run: dotnet run --project build/MauiVersionUpdater/MauiVersionUpdater.csproj -- https://aka.ms/dotnet/maui/6.0.300/rc.3.json
- name: Restore Comet-Nuget.sln
run: msbuild /r build/Comet-Nuget.sln

2
.github/workflows/main-template.yml поставляемый
Просмотреть файл

@ -29,7 +29,7 @@ jobs:
run: |
$ProgressPreference = 'SilentlyContinue'
Invoke-WebRequest -Uri "https://dot.net/v1/dotnet-install.ps1" -OutFile dotnet-install.ps1
& .\dotnet-install.ps1 -Version 6.0.100 -InstallDir "$env:ProgramFiles\dotnet\" -Verbose
& .\dotnet-install.ps1 -InstallDir "$env:ProgramFiles\dotnet\" -Verbose
& dotnet --list-sdks
# - name: Install Visual Studio Preview

9
.github/workflows/main.yml поставляемый
Просмотреть файл

@ -33,7 +33,7 @@ jobs:
run: |
$ProgressPreference = 'SilentlyContinue'
Invoke-WebRequest -Uri "https://dot.net/v1/dotnet-install.ps1" -OutFile dotnet-install.ps1
& .\dotnet-install.ps1 -Quality daily -Channel 6.0.3xx -InstallDir "$env:ProgramFiles\dotnet\" -Verbose
& .\dotnet-install.ps1 -InstallDir "$env:ProgramFiles\dotnet\" -Verbose
& dotnet --list-sdks
# - name: Install Visual Studio Preview
@ -49,11 +49,8 @@ jobs:
- name: Install Maui Workload
shell: pwsh
run: |
& dotnet workload install maui
# - name: Set Maui Version
# run: dotnet run --project build/MauiVersionUpdater/MauiVersionUpdater.csproj -- https://aka.ms/dotnet/maui/6.0.300/rc.3.json
& dotnet workload install maui `
--skip-sign-check
- name: Restore Comet-Nuget.sln
run: msbuild /r build/Comet-Nuget.sln

242
Comet.Debug.sln Normal file
Просмотреть файл

@ -0,0 +1,242 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.0.31806.525
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Sample", "Sample", "{C3FDCDB7-0C29-472D-A406-E2F21A4B0EAE}"
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}") = "Comet.Sample", "sample\Comet.Sample\Comet.Sample.csproj", "{F193CE01-DF8B-4BC1-B9D5-C259455F61D6}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Comet.SourceGenerator", "src\Comet.SourceGenerator\Comet.SourceGenerator.csproj", "{E8853E46-534E-46EC-840B-5AD3C47FEBA0}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Maui", "Maui", "{AF80EA4A-ED76-4B9D-B6F9-971E2CBD016E}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Comet.debug", "src\Comet\Comet.debug.csproj", "{711F114B-28D8-4BAB-85CD-B6DAA5F8EB59}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Essentials", "external\Maui\src\Essentials\src\Essentials.csproj", "{9EC9659F-FF70-469F-A6E2-011F4B42787F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core", "external\Maui\src\Core\src\Core.csproj", "{7DB9FB7D-F863-42B9-A6CD-E555C387C248}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|ARM = Debug|ARM
Debug|ARM64 = Debug|ARM64
Debug|iPhone = Debug|iPhone
Debug|iPhoneSimulator = Debug|iPhoneSimulator
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Release|Any CPU = Release|Any CPU
Release|ARM = Release|ARM
Release|ARM64 = Release|ARM64
Release|iPhone = Release|iPhone
Release|iPhoneSimulator = Release|iPhoneSimulator
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{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
{D4931444-94DD-49C6-8AFC-2228CDBDD5EA}.Debug|ARM.Build.0 = Debug|Any CPU
{D4931444-94DD-49C6-8AFC-2228CDBDD5EA}.Debug|ARM64.ActiveCfg = Debug|Any CPU
{D4931444-94DD-49C6-8AFC-2228CDBDD5EA}.Debug|ARM64.Build.0 = Debug|Any CPU
{D4931444-94DD-49C6-8AFC-2228CDBDD5EA}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{D4931444-94DD-49C6-8AFC-2228CDBDD5EA}.Debug|iPhone.Build.0 = Debug|Any CPU
{D4931444-94DD-49C6-8AFC-2228CDBDD5EA}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{D4931444-94DD-49C6-8AFC-2228CDBDD5EA}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{D4931444-94DD-49C6-8AFC-2228CDBDD5EA}.Debug|x64.ActiveCfg = Debug|Any CPU
{D4931444-94DD-49C6-8AFC-2228CDBDD5EA}.Debug|x64.Build.0 = Debug|Any CPU
{D4931444-94DD-49C6-8AFC-2228CDBDD5EA}.Debug|x86.ActiveCfg = Debug|Any CPU
{D4931444-94DD-49C6-8AFC-2228CDBDD5EA}.Debug|x86.Build.0 = Debug|Any CPU
{D4931444-94DD-49C6-8AFC-2228CDBDD5EA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D4931444-94DD-49C6-8AFC-2228CDBDD5EA}.Release|Any CPU.Build.0 = Release|Any CPU
{D4931444-94DD-49C6-8AFC-2228CDBDD5EA}.Release|ARM.ActiveCfg = Release|Any CPU
{D4931444-94DD-49C6-8AFC-2228CDBDD5EA}.Release|ARM.Build.0 = Release|Any CPU
{D4931444-94DD-49C6-8AFC-2228CDBDD5EA}.Release|ARM64.ActiveCfg = Release|Any CPU
{D4931444-94DD-49C6-8AFC-2228CDBDD5EA}.Release|ARM64.Build.0 = Release|Any CPU
{D4931444-94DD-49C6-8AFC-2228CDBDD5EA}.Release|iPhone.ActiveCfg = Release|Any CPU
{D4931444-94DD-49C6-8AFC-2228CDBDD5EA}.Release|iPhone.Build.0 = Release|Any CPU
{D4931444-94DD-49C6-8AFC-2228CDBDD5EA}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{D4931444-94DD-49C6-8AFC-2228CDBDD5EA}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{D4931444-94DD-49C6-8AFC-2228CDBDD5EA}.Release|x64.ActiveCfg = Release|Any CPU
{D4931444-94DD-49C6-8AFC-2228CDBDD5EA}.Release|x64.Build.0 = Release|Any CPU
{D4931444-94DD-49C6-8AFC-2228CDBDD5EA}.Release|x86.ActiveCfg = Release|Any CPU
{D4931444-94DD-49C6-8AFC-2228CDBDD5EA}.Release|x86.Build.0 = Release|Any CPU
{F193CE01-DF8B-4BC1-B9D5-C259455F61D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F193CE01-DF8B-4BC1-B9D5-C259455F61D6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F193CE01-DF8B-4BC1-B9D5-C259455F61D6}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
{F193CE01-DF8B-4BC1-B9D5-C259455F61D6}.Debug|ARM.ActiveCfg = Debug|Any CPU
{F193CE01-DF8B-4BC1-B9D5-C259455F61D6}.Debug|ARM.Build.0 = Debug|Any CPU
{F193CE01-DF8B-4BC1-B9D5-C259455F61D6}.Debug|ARM.Deploy.0 = Debug|Any CPU
{F193CE01-DF8B-4BC1-B9D5-C259455F61D6}.Debug|ARM64.ActiveCfg = Debug|Any CPU
{F193CE01-DF8B-4BC1-B9D5-C259455F61D6}.Debug|ARM64.Build.0 = Debug|Any CPU
{F193CE01-DF8B-4BC1-B9D5-C259455F61D6}.Debug|ARM64.Deploy.0 = Debug|Any CPU
{F193CE01-DF8B-4BC1-B9D5-C259455F61D6}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{F193CE01-DF8B-4BC1-B9D5-C259455F61D6}.Debug|iPhone.Build.0 = Debug|Any CPU
{F193CE01-DF8B-4BC1-B9D5-C259455F61D6}.Debug|iPhone.Deploy.0 = Debug|Any CPU
{F193CE01-DF8B-4BC1-B9D5-C259455F61D6}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{F193CE01-DF8B-4BC1-B9D5-C259455F61D6}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{F193CE01-DF8B-4BC1-B9D5-C259455F61D6}.Debug|iPhoneSimulator.Deploy.0 = Debug|Any CPU
{F193CE01-DF8B-4BC1-B9D5-C259455F61D6}.Debug|x64.ActiveCfg = Debug|Any CPU
{F193CE01-DF8B-4BC1-B9D5-C259455F61D6}.Debug|x64.Build.0 = Debug|Any CPU
{F193CE01-DF8B-4BC1-B9D5-C259455F61D6}.Debug|x64.Deploy.0 = Debug|Any CPU
{F193CE01-DF8B-4BC1-B9D5-C259455F61D6}.Debug|x86.ActiveCfg = Debug|Any CPU
{F193CE01-DF8B-4BC1-B9D5-C259455F61D6}.Debug|x86.Build.0 = Debug|Any CPU
{F193CE01-DF8B-4BC1-B9D5-C259455F61D6}.Debug|x86.Deploy.0 = Debug|Any CPU
{F193CE01-DF8B-4BC1-B9D5-C259455F61D6}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F193CE01-DF8B-4BC1-B9D5-C259455F61D6}.Release|Any CPU.Build.0 = Release|Any CPU
{F193CE01-DF8B-4BC1-B9D5-C259455F61D6}.Release|Any CPU.Deploy.0 = Release|Any CPU
{F193CE01-DF8B-4BC1-B9D5-C259455F61D6}.Release|ARM.ActiveCfg = Release|Any CPU
{F193CE01-DF8B-4BC1-B9D5-C259455F61D6}.Release|ARM.Build.0 = Release|Any CPU
{F193CE01-DF8B-4BC1-B9D5-C259455F61D6}.Release|ARM.Deploy.0 = Release|Any CPU
{F193CE01-DF8B-4BC1-B9D5-C259455F61D6}.Release|ARM64.ActiveCfg = Release|Any CPU
{F193CE01-DF8B-4BC1-B9D5-C259455F61D6}.Release|ARM64.Build.0 = Release|Any CPU
{F193CE01-DF8B-4BC1-B9D5-C259455F61D6}.Release|ARM64.Deploy.0 = Release|Any CPU
{F193CE01-DF8B-4BC1-B9D5-C259455F61D6}.Release|iPhone.ActiveCfg = Release|Any CPU
{F193CE01-DF8B-4BC1-B9D5-C259455F61D6}.Release|iPhone.Build.0 = Release|Any CPU
{F193CE01-DF8B-4BC1-B9D5-C259455F61D6}.Release|iPhone.Deploy.0 = Release|Any CPU
{F193CE01-DF8B-4BC1-B9D5-C259455F61D6}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{F193CE01-DF8B-4BC1-B9D5-C259455F61D6}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{F193CE01-DF8B-4BC1-B9D5-C259455F61D6}.Release|iPhoneSimulator.Deploy.0 = Release|Any CPU
{F193CE01-DF8B-4BC1-B9D5-C259455F61D6}.Release|x64.ActiveCfg = Release|Any CPU
{F193CE01-DF8B-4BC1-B9D5-C259455F61D6}.Release|x64.Build.0 = Release|Any CPU
{F193CE01-DF8B-4BC1-B9D5-C259455F61D6}.Release|x64.Deploy.0 = Release|Any CPU
{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
{E8853E46-534E-46EC-840B-5AD3C47FEBA0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E8853E46-534E-46EC-840B-5AD3C47FEBA0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E8853E46-534E-46EC-840B-5AD3C47FEBA0}.Debug|ARM.ActiveCfg = Debug|Any CPU
{E8853E46-534E-46EC-840B-5AD3C47FEBA0}.Debug|ARM.Build.0 = Debug|Any CPU
{E8853E46-534E-46EC-840B-5AD3C47FEBA0}.Debug|ARM64.ActiveCfg = Debug|Any CPU
{E8853E46-534E-46EC-840B-5AD3C47FEBA0}.Debug|ARM64.Build.0 = Debug|Any CPU
{E8853E46-534E-46EC-840B-5AD3C47FEBA0}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{E8853E46-534E-46EC-840B-5AD3C47FEBA0}.Debug|iPhone.Build.0 = Debug|Any CPU
{E8853E46-534E-46EC-840B-5AD3C47FEBA0}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{E8853E46-534E-46EC-840B-5AD3C47FEBA0}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{E8853E46-534E-46EC-840B-5AD3C47FEBA0}.Debug|x64.ActiveCfg = Debug|Any CPU
{E8853E46-534E-46EC-840B-5AD3C47FEBA0}.Debug|x64.Build.0 = Debug|Any CPU
{E8853E46-534E-46EC-840B-5AD3C47FEBA0}.Debug|x86.ActiveCfg = Debug|Any CPU
{E8853E46-534E-46EC-840B-5AD3C47FEBA0}.Debug|x86.Build.0 = Debug|Any CPU
{E8853E46-534E-46EC-840B-5AD3C47FEBA0}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E8853E46-534E-46EC-840B-5AD3C47FEBA0}.Release|Any CPU.Build.0 = Release|Any CPU
{E8853E46-534E-46EC-840B-5AD3C47FEBA0}.Release|ARM.ActiveCfg = Release|Any CPU
{E8853E46-534E-46EC-840B-5AD3C47FEBA0}.Release|ARM.Build.0 = Release|Any CPU
{E8853E46-534E-46EC-840B-5AD3C47FEBA0}.Release|ARM64.ActiveCfg = Release|Any CPU
{E8853E46-534E-46EC-840B-5AD3C47FEBA0}.Release|ARM64.Build.0 = Release|Any CPU
{E8853E46-534E-46EC-840B-5AD3C47FEBA0}.Release|iPhone.ActiveCfg = Release|Any CPU
{E8853E46-534E-46EC-840B-5AD3C47FEBA0}.Release|iPhone.Build.0 = Release|Any CPU
{E8853E46-534E-46EC-840B-5AD3C47FEBA0}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{E8853E46-534E-46EC-840B-5AD3C47FEBA0}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{E8853E46-534E-46EC-840B-5AD3C47FEBA0}.Release|x64.ActiveCfg = Release|Any CPU
{E8853E46-534E-46EC-840B-5AD3C47FEBA0}.Release|x64.Build.0 = Release|Any CPU
{E8853E46-534E-46EC-840B-5AD3C47FEBA0}.Release|x86.ActiveCfg = Release|Any CPU
{E8853E46-534E-46EC-840B-5AD3C47FEBA0}.Release|x86.Build.0 = Release|Any CPU
{711F114B-28D8-4BAB-85CD-B6DAA5F8EB59}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{711F114B-28D8-4BAB-85CD-B6DAA5F8EB59}.Debug|Any CPU.Build.0 = Debug|Any CPU
{711F114B-28D8-4BAB-85CD-B6DAA5F8EB59}.Debug|ARM.ActiveCfg = Debug|Any CPU
{711F114B-28D8-4BAB-85CD-B6DAA5F8EB59}.Debug|ARM.Build.0 = Debug|Any CPU
{711F114B-28D8-4BAB-85CD-B6DAA5F8EB59}.Debug|ARM64.ActiveCfg = Debug|Any CPU
{711F114B-28D8-4BAB-85CD-B6DAA5F8EB59}.Debug|ARM64.Build.0 = Debug|Any CPU
{711F114B-28D8-4BAB-85CD-B6DAA5F8EB59}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{711F114B-28D8-4BAB-85CD-B6DAA5F8EB59}.Debug|iPhone.Build.0 = Debug|Any CPU
{711F114B-28D8-4BAB-85CD-B6DAA5F8EB59}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{711F114B-28D8-4BAB-85CD-B6DAA5F8EB59}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{711F114B-28D8-4BAB-85CD-B6DAA5F8EB59}.Debug|x64.ActiveCfg = Debug|Any CPU
{711F114B-28D8-4BAB-85CD-B6DAA5F8EB59}.Debug|x64.Build.0 = Debug|Any CPU
{711F114B-28D8-4BAB-85CD-B6DAA5F8EB59}.Debug|x86.ActiveCfg = Debug|Any CPU
{711F114B-28D8-4BAB-85CD-B6DAA5F8EB59}.Debug|x86.Build.0 = Debug|Any CPU
{711F114B-28D8-4BAB-85CD-B6DAA5F8EB59}.Release|Any CPU.ActiveCfg = Release|Any CPU
{711F114B-28D8-4BAB-85CD-B6DAA5F8EB59}.Release|Any CPU.Build.0 = Release|Any CPU
{711F114B-28D8-4BAB-85CD-B6DAA5F8EB59}.Release|ARM.ActiveCfg = Release|Any CPU
{711F114B-28D8-4BAB-85CD-B6DAA5F8EB59}.Release|ARM.Build.0 = Release|Any CPU
{711F114B-28D8-4BAB-85CD-B6DAA5F8EB59}.Release|ARM64.ActiveCfg = Release|Any CPU
{711F114B-28D8-4BAB-85CD-B6DAA5F8EB59}.Release|ARM64.Build.0 = Release|Any CPU
{711F114B-28D8-4BAB-85CD-B6DAA5F8EB59}.Release|iPhone.ActiveCfg = Release|Any CPU
{711F114B-28D8-4BAB-85CD-B6DAA5F8EB59}.Release|iPhone.Build.0 = Release|Any CPU
{711F114B-28D8-4BAB-85CD-B6DAA5F8EB59}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{711F114B-28D8-4BAB-85CD-B6DAA5F8EB59}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{711F114B-28D8-4BAB-85CD-B6DAA5F8EB59}.Release|x64.ActiveCfg = Release|Any CPU
{711F114B-28D8-4BAB-85CD-B6DAA5F8EB59}.Release|x64.Build.0 = Release|Any CPU
{711F114B-28D8-4BAB-85CD-B6DAA5F8EB59}.Release|x86.ActiveCfg = Release|Any CPU
{711F114B-28D8-4BAB-85CD-B6DAA5F8EB59}.Release|x86.Build.0 = Release|Any CPU
{9EC9659F-FF70-469F-A6E2-011F4B42787F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9EC9659F-FF70-469F-A6E2-011F4B42787F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9EC9659F-FF70-469F-A6E2-011F4B42787F}.Debug|ARM.ActiveCfg = Debug|Any CPU
{9EC9659F-FF70-469F-A6E2-011F4B42787F}.Debug|ARM.Build.0 = Debug|Any CPU
{9EC9659F-FF70-469F-A6E2-011F4B42787F}.Debug|ARM64.ActiveCfg = Debug|Any CPU
{9EC9659F-FF70-469F-A6E2-011F4B42787F}.Debug|ARM64.Build.0 = Debug|Any CPU
{9EC9659F-FF70-469F-A6E2-011F4B42787F}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{9EC9659F-FF70-469F-A6E2-011F4B42787F}.Debug|iPhone.Build.0 = Debug|Any CPU
{9EC9659F-FF70-469F-A6E2-011F4B42787F}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{9EC9659F-FF70-469F-A6E2-011F4B42787F}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{9EC9659F-FF70-469F-A6E2-011F4B42787F}.Debug|x64.ActiveCfg = Debug|Any CPU
{9EC9659F-FF70-469F-A6E2-011F4B42787F}.Debug|x64.Build.0 = Debug|Any CPU
{9EC9659F-FF70-469F-A6E2-011F4B42787F}.Debug|x86.ActiveCfg = Debug|Any CPU
{9EC9659F-FF70-469F-A6E2-011F4B42787F}.Debug|x86.Build.0 = Debug|Any CPU
{9EC9659F-FF70-469F-A6E2-011F4B42787F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9EC9659F-FF70-469F-A6E2-011F4B42787F}.Release|Any CPU.Build.0 = Release|Any CPU
{9EC9659F-FF70-469F-A6E2-011F4B42787F}.Release|ARM.ActiveCfg = Release|Any CPU
{9EC9659F-FF70-469F-A6E2-011F4B42787F}.Release|ARM.Build.0 = Release|Any CPU
{9EC9659F-FF70-469F-A6E2-011F4B42787F}.Release|ARM64.ActiveCfg = Release|Any CPU
{9EC9659F-FF70-469F-A6E2-011F4B42787F}.Release|ARM64.Build.0 = Release|Any CPU
{9EC9659F-FF70-469F-A6E2-011F4B42787F}.Release|iPhone.ActiveCfg = Release|Any CPU
{9EC9659F-FF70-469F-A6E2-011F4B42787F}.Release|iPhone.Build.0 = Release|Any CPU
{9EC9659F-FF70-469F-A6E2-011F4B42787F}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{9EC9659F-FF70-469F-A6E2-011F4B42787F}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{9EC9659F-FF70-469F-A6E2-011F4B42787F}.Release|x64.ActiveCfg = Release|Any CPU
{9EC9659F-FF70-469F-A6E2-011F4B42787F}.Release|x64.Build.0 = Release|Any CPU
{9EC9659F-FF70-469F-A6E2-011F4B42787F}.Release|x86.ActiveCfg = Release|Any CPU
{9EC9659F-FF70-469F-A6E2-011F4B42787F}.Release|x86.Build.0 = Release|Any CPU
{7DB9FB7D-F863-42B9-A6CD-E555C387C248}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7DB9FB7D-F863-42B9-A6CD-E555C387C248}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7DB9FB7D-F863-42B9-A6CD-E555C387C248}.Debug|ARM.ActiveCfg = Debug|Any CPU
{7DB9FB7D-F863-42B9-A6CD-E555C387C248}.Debug|ARM.Build.0 = Debug|Any CPU
{7DB9FB7D-F863-42B9-A6CD-E555C387C248}.Debug|ARM64.ActiveCfg = Debug|Any CPU
{7DB9FB7D-F863-42B9-A6CD-E555C387C248}.Debug|ARM64.Build.0 = Debug|Any CPU
{7DB9FB7D-F863-42B9-A6CD-E555C387C248}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{7DB9FB7D-F863-42B9-A6CD-E555C387C248}.Debug|iPhone.Build.0 = Debug|Any CPU
{7DB9FB7D-F863-42B9-A6CD-E555C387C248}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{7DB9FB7D-F863-42B9-A6CD-E555C387C248}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{7DB9FB7D-F863-42B9-A6CD-E555C387C248}.Debug|x64.ActiveCfg = Debug|Any CPU
{7DB9FB7D-F863-42B9-A6CD-E555C387C248}.Debug|x64.Build.0 = Debug|Any CPU
{7DB9FB7D-F863-42B9-A6CD-E555C387C248}.Debug|x86.ActiveCfg = Debug|Any CPU
{7DB9FB7D-F863-42B9-A6CD-E555C387C248}.Debug|x86.Build.0 = Debug|Any CPU
{7DB9FB7D-F863-42B9-A6CD-E555C387C248}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7DB9FB7D-F863-42B9-A6CD-E555C387C248}.Release|Any CPU.Build.0 = Release|Any CPU
{7DB9FB7D-F863-42B9-A6CD-E555C387C248}.Release|ARM.ActiveCfg = Release|Any CPU
{7DB9FB7D-F863-42B9-A6CD-E555C387C248}.Release|ARM.Build.0 = Release|Any CPU
{7DB9FB7D-F863-42B9-A6CD-E555C387C248}.Release|ARM64.ActiveCfg = Release|Any CPU
{7DB9FB7D-F863-42B9-A6CD-E555C387C248}.Release|ARM64.Build.0 = Release|Any CPU
{7DB9FB7D-F863-42B9-A6CD-E555C387C248}.Release|iPhone.ActiveCfg = Release|Any CPU
{7DB9FB7D-F863-42B9-A6CD-E555C387C248}.Release|iPhone.Build.0 = Release|Any CPU
{7DB9FB7D-F863-42B9-A6CD-E555C387C248}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{7DB9FB7D-F863-42B9-A6CD-E555C387C248}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{7DB9FB7D-F863-42B9-A6CD-E555C387C248}.Release|x64.ActiveCfg = Release|Any CPU
{7DB9FB7D-F863-42B9-A6CD-E555C387C248}.Release|x64.Build.0 = Release|Any CPU
{7DB9FB7D-F863-42B9-A6CD-E555C387C248}.Release|x86.ActiveCfg = Release|Any CPU
{7DB9FB7D-F863-42B9-A6CD-E555C387C248}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{D4931444-94DD-49C6-8AFC-2228CDBDD5EA} = {C3FDCDB7-0C29-472D-A406-E2F21A4B0EAE}
{F193CE01-DF8B-4BC1-B9D5-C259455F61D6} = {C3FDCDB7-0C29-472D-A406-E2F21A4B0EAE}
{9EC9659F-FF70-469F-A6E2-011F4B42787F} = {AF80EA4A-ED76-4B9D-B6F9-971E2CBD016E}
{7DB9FB7D-F863-42B9-A6CD-E555C387C248} = {AF80EA4A-ED76-4B9D-B6F9-971E2CBD016E}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {0653DB4A-5BBE-4D78-99B2-DB1C82663246}
EndGlobalSection
GlobalSection(MonoDevelopProperties) = preSolution
Policies = $0
$0.DotNetNamingPolicy = $1
EndGlobalSection
EndGlobal

Просмотреть файл

@ -37,8 +37,8 @@
</metadata>
<files>
<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="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"/>
<file src="src/Comet/bin/Debug/netstandard2.0/Microsoft.Maui.dll" target="lib/netstandard2.0/Microsoft.Maui.dll"/>
<file src="src/Comet/bin/Debug/netstandard2.0/Microsoft.Maui.pdb" target="lib/netstandard2.0/Microsoft.Maui.pdb"/>

151
Comet.sln
Просмотреть файл

@ -14,13 +14,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Comet.Sample", "sample\Come
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Comet.SourceGenerator", "src\Comet.SourceGenerator\Comet.SourceGenerator.csproj", "{E8853E46-534E-46EC-840B-5AD3C47FEBA0}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Maui", "Maui", "{AF80EA4A-ED76-4B9D-B6F9-971E2CBD016E}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Comet.debug", "src\Comet\Comet.debug.csproj", "{711F114B-28D8-4BAB-85CD-B6DAA5F8EB59}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Essentials", "external\Maui\src\Essentials\src\Essentials.csproj", "{9EC9659F-FF70-469F-A6E2-011F4B42787F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core", "external\Maui\src\Core\src\Core.csproj", "{7DB9FB7D-F863-42B9-A6CD-E555C387C248}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Comet", "src\Comet\Comet.csproj", "{891389AB-92AF-4B7B-9DD6-3B39148898B9}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@ -40,34 +34,6 @@ Global
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{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
{D4931444-94DD-49C6-8AFC-2228CDBDD5EA}.Debug|ARM.Build.0 = Debug|Any CPU
{D4931444-94DD-49C6-8AFC-2228CDBDD5EA}.Debug|ARM64.ActiveCfg = Debug|Any CPU
{D4931444-94DD-49C6-8AFC-2228CDBDD5EA}.Debug|ARM64.Build.0 = Debug|Any CPU
{D4931444-94DD-49C6-8AFC-2228CDBDD5EA}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{D4931444-94DD-49C6-8AFC-2228CDBDD5EA}.Debug|iPhone.Build.0 = Debug|Any CPU
{D4931444-94DD-49C6-8AFC-2228CDBDD5EA}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{D4931444-94DD-49C6-8AFC-2228CDBDD5EA}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{D4931444-94DD-49C6-8AFC-2228CDBDD5EA}.Debug|x64.ActiveCfg = Debug|Any CPU
{D4931444-94DD-49C6-8AFC-2228CDBDD5EA}.Debug|x64.Build.0 = Debug|Any CPU
{D4931444-94DD-49C6-8AFC-2228CDBDD5EA}.Debug|x86.ActiveCfg = Debug|Any CPU
{D4931444-94DD-49C6-8AFC-2228CDBDD5EA}.Debug|x86.Build.0 = Debug|Any CPU
{D4931444-94DD-49C6-8AFC-2228CDBDD5EA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D4931444-94DD-49C6-8AFC-2228CDBDD5EA}.Release|Any CPU.Build.0 = Release|Any CPU
{D4931444-94DD-49C6-8AFC-2228CDBDD5EA}.Release|ARM.ActiveCfg = Release|Any CPU
{D4931444-94DD-49C6-8AFC-2228CDBDD5EA}.Release|ARM.Build.0 = Release|Any CPU
{D4931444-94DD-49C6-8AFC-2228CDBDD5EA}.Release|ARM64.ActiveCfg = Release|Any CPU
{D4931444-94DD-49C6-8AFC-2228CDBDD5EA}.Release|ARM64.Build.0 = Release|Any CPU
{D4931444-94DD-49C6-8AFC-2228CDBDD5EA}.Release|iPhone.ActiveCfg = Release|Any CPU
{D4931444-94DD-49C6-8AFC-2228CDBDD5EA}.Release|iPhone.Build.0 = Release|Any CPU
{D4931444-94DD-49C6-8AFC-2228CDBDD5EA}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{D4931444-94DD-49C6-8AFC-2228CDBDD5EA}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{D4931444-94DD-49C6-8AFC-2228CDBDD5EA}.Release|x64.ActiveCfg = Release|Any CPU
{D4931444-94DD-49C6-8AFC-2228CDBDD5EA}.Release|x64.Build.0 = Release|Any CPU
{D4931444-94DD-49C6-8AFC-2228CDBDD5EA}.Release|x86.ActiveCfg = Release|Any CPU
{D4931444-94DD-49C6-8AFC-2228CDBDD5EA}.Release|x86.Build.0 = Release|Any CPU
{F193CE01-DF8B-4BC1-B9D5-C259455F61D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F193CE01-DF8B-4BC1-B9D5-C259455F61D6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F193CE01-DF8B-4BC1-B9D5-C259455F61D6}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
@ -138,99 +104,40 @@ Global
{E8853E46-534E-46EC-840B-5AD3C47FEBA0}.Release|x64.Build.0 = Release|Any CPU
{E8853E46-534E-46EC-840B-5AD3C47FEBA0}.Release|x86.ActiveCfg = Release|Any CPU
{E8853E46-534E-46EC-840B-5AD3C47FEBA0}.Release|x86.Build.0 = Release|Any CPU
{711F114B-28D8-4BAB-85CD-B6DAA5F8EB59}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{711F114B-28D8-4BAB-85CD-B6DAA5F8EB59}.Debug|Any CPU.Build.0 = Debug|Any CPU
{711F114B-28D8-4BAB-85CD-B6DAA5F8EB59}.Debug|ARM.ActiveCfg = Debug|Any CPU
{711F114B-28D8-4BAB-85CD-B6DAA5F8EB59}.Debug|ARM.Build.0 = Debug|Any CPU
{711F114B-28D8-4BAB-85CD-B6DAA5F8EB59}.Debug|ARM64.ActiveCfg = Debug|Any CPU
{711F114B-28D8-4BAB-85CD-B6DAA5F8EB59}.Debug|ARM64.Build.0 = Debug|Any CPU
{711F114B-28D8-4BAB-85CD-B6DAA5F8EB59}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{711F114B-28D8-4BAB-85CD-B6DAA5F8EB59}.Debug|iPhone.Build.0 = Debug|Any CPU
{711F114B-28D8-4BAB-85CD-B6DAA5F8EB59}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{711F114B-28D8-4BAB-85CD-B6DAA5F8EB59}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{711F114B-28D8-4BAB-85CD-B6DAA5F8EB59}.Debug|x64.ActiveCfg = Debug|Any CPU
{711F114B-28D8-4BAB-85CD-B6DAA5F8EB59}.Debug|x64.Build.0 = Debug|Any CPU
{711F114B-28D8-4BAB-85CD-B6DAA5F8EB59}.Debug|x86.ActiveCfg = Debug|Any CPU
{711F114B-28D8-4BAB-85CD-B6DAA5F8EB59}.Debug|x86.Build.0 = Debug|Any CPU
{711F114B-28D8-4BAB-85CD-B6DAA5F8EB59}.Release|Any CPU.ActiveCfg = Release|Any CPU
{711F114B-28D8-4BAB-85CD-B6DAA5F8EB59}.Release|Any CPU.Build.0 = Release|Any CPU
{711F114B-28D8-4BAB-85CD-B6DAA5F8EB59}.Release|ARM.ActiveCfg = Release|Any CPU
{711F114B-28D8-4BAB-85CD-B6DAA5F8EB59}.Release|ARM.Build.0 = Release|Any CPU
{711F114B-28D8-4BAB-85CD-B6DAA5F8EB59}.Release|ARM64.ActiveCfg = Release|Any CPU
{711F114B-28D8-4BAB-85CD-B6DAA5F8EB59}.Release|ARM64.Build.0 = Release|Any CPU
{711F114B-28D8-4BAB-85CD-B6DAA5F8EB59}.Release|iPhone.ActiveCfg = Release|Any CPU
{711F114B-28D8-4BAB-85CD-B6DAA5F8EB59}.Release|iPhone.Build.0 = Release|Any CPU
{711F114B-28D8-4BAB-85CD-B6DAA5F8EB59}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{711F114B-28D8-4BAB-85CD-B6DAA5F8EB59}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{711F114B-28D8-4BAB-85CD-B6DAA5F8EB59}.Release|x64.ActiveCfg = Release|Any CPU
{711F114B-28D8-4BAB-85CD-B6DAA5F8EB59}.Release|x64.Build.0 = Release|Any CPU
{711F114B-28D8-4BAB-85CD-B6DAA5F8EB59}.Release|x86.ActiveCfg = Release|Any CPU
{711F114B-28D8-4BAB-85CD-B6DAA5F8EB59}.Release|x86.Build.0 = Release|Any CPU
{9EC9659F-FF70-469F-A6E2-011F4B42787F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9EC9659F-FF70-469F-A6E2-011F4B42787F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9EC9659F-FF70-469F-A6E2-011F4B42787F}.Debug|ARM.ActiveCfg = Debug|Any CPU
{9EC9659F-FF70-469F-A6E2-011F4B42787F}.Debug|ARM.Build.0 = Debug|Any CPU
{9EC9659F-FF70-469F-A6E2-011F4B42787F}.Debug|ARM64.ActiveCfg = Debug|Any CPU
{9EC9659F-FF70-469F-A6E2-011F4B42787F}.Debug|ARM64.Build.0 = Debug|Any CPU
{9EC9659F-FF70-469F-A6E2-011F4B42787F}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{9EC9659F-FF70-469F-A6E2-011F4B42787F}.Debug|iPhone.Build.0 = Debug|Any CPU
{9EC9659F-FF70-469F-A6E2-011F4B42787F}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{9EC9659F-FF70-469F-A6E2-011F4B42787F}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{9EC9659F-FF70-469F-A6E2-011F4B42787F}.Debug|x64.ActiveCfg = Debug|Any CPU
{9EC9659F-FF70-469F-A6E2-011F4B42787F}.Debug|x64.Build.0 = Debug|Any CPU
{9EC9659F-FF70-469F-A6E2-011F4B42787F}.Debug|x86.ActiveCfg = Debug|Any CPU
{9EC9659F-FF70-469F-A6E2-011F4B42787F}.Debug|x86.Build.0 = Debug|Any CPU
{9EC9659F-FF70-469F-A6E2-011F4B42787F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9EC9659F-FF70-469F-A6E2-011F4B42787F}.Release|Any CPU.Build.0 = Release|Any CPU
{9EC9659F-FF70-469F-A6E2-011F4B42787F}.Release|ARM.ActiveCfg = Release|Any CPU
{9EC9659F-FF70-469F-A6E2-011F4B42787F}.Release|ARM.Build.0 = Release|Any CPU
{9EC9659F-FF70-469F-A6E2-011F4B42787F}.Release|ARM64.ActiveCfg = Release|Any CPU
{9EC9659F-FF70-469F-A6E2-011F4B42787F}.Release|ARM64.Build.0 = Release|Any CPU
{9EC9659F-FF70-469F-A6E2-011F4B42787F}.Release|iPhone.ActiveCfg = Release|Any CPU
{9EC9659F-FF70-469F-A6E2-011F4B42787F}.Release|iPhone.Build.0 = Release|Any CPU
{9EC9659F-FF70-469F-A6E2-011F4B42787F}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{9EC9659F-FF70-469F-A6E2-011F4B42787F}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{9EC9659F-FF70-469F-A6E2-011F4B42787F}.Release|x64.ActiveCfg = Release|Any CPU
{9EC9659F-FF70-469F-A6E2-011F4B42787F}.Release|x64.Build.0 = Release|Any CPU
{9EC9659F-FF70-469F-A6E2-011F4B42787F}.Release|x86.ActiveCfg = Release|Any CPU
{9EC9659F-FF70-469F-A6E2-011F4B42787F}.Release|x86.Build.0 = Release|Any CPU
{7DB9FB7D-F863-42B9-A6CD-E555C387C248}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7DB9FB7D-F863-42B9-A6CD-E555C387C248}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7DB9FB7D-F863-42B9-A6CD-E555C387C248}.Debug|ARM.ActiveCfg = Debug|Any CPU
{7DB9FB7D-F863-42B9-A6CD-E555C387C248}.Debug|ARM.Build.0 = Debug|Any CPU
{7DB9FB7D-F863-42B9-A6CD-E555C387C248}.Debug|ARM64.ActiveCfg = Debug|Any CPU
{7DB9FB7D-F863-42B9-A6CD-E555C387C248}.Debug|ARM64.Build.0 = Debug|Any CPU
{7DB9FB7D-F863-42B9-A6CD-E555C387C248}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{7DB9FB7D-F863-42B9-A6CD-E555C387C248}.Debug|iPhone.Build.0 = Debug|Any CPU
{7DB9FB7D-F863-42B9-A6CD-E555C387C248}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{7DB9FB7D-F863-42B9-A6CD-E555C387C248}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{7DB9FB7D-F863-42B9-A6CD-E555C387C248}.Debug|x64.ActiveCfg = Debug|Any CPU
{7DB9FB7D-F863-42B9-A6CD-E555C387C248}.Debug|x64.Build.0 = Debug|Any CPU
{7DB9FB7D-F863-42B9-A6CD-E555C387C248}.Debug|x86.ActiveCfg = Debug|Any CPU
{7DB9FB7D-F863-42B9-A6CD-E555C387C248}.Debug|x86.Build.0 = Debug|Any CPU
{7DB9FB7D-F863-42B9-A6CD-E555C387C248}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7DB9FB7D-F863-42B9-A6CD-E555C387C248}.Release|Any CPU.Build.0 = Release|Any CPU
{7DB9FB7D-F863-42B9-A6CD-E555C387C248}.Release|ARM.ActiveCfg = Release|Any CPU
{7DB9FB7D-F863-42B9-A6CD-E555C387C248}.Release|ARM.Build.0 = Release|Any CPU
{7DB9FB7D-F863-42B9-A6CD-E555C387C248}.Release|ARM64.ActiveCfg = Release|Any CPU
{7DB9FB7D-F863-42B9-A6CD-E555C387C248}.Release|ARM64.Build.0 = Release|Any CPU
{7DB9FB7D-F863-42B9-A6CD-E555C387C248}.Release|iPhone.ActiveCfg = Release|Any CPU
{7DB9FB7D-F863-42B9-A6CD-E555C387C248}.Release|iPhone.Build.0 = Release|Any CPU
{7DB9FB7D-F863-42B9-A6CD-E555C387C248}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{7DB9FB7D-F863-42B9-A6CD-E555C387C248}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{7DB9FB7D-F863-42B9-A6CD-E555C387C248}.Release|x64.ActiveCfg = Release|Any CPU
{7DB9FB7D-F863-42B9-A6CD-E555C387C248}.Release|x64.Build.0 = Release|Any CPU
{7DB9FB7D-F863-42B9-A6CD-E555C387C248}.Release|x86.ActiveCfg = Release|Any CPU
{7DB9FB7D-F863-42B9-A6CD-E555C387C248}.Release|x86.Build.0 = Release|Any CPU
{891389AB-92AF-4B7B-9DD6-3B39148898B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{891389AB-92AF-4B7B-9DD6-3B39148898B9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{891389AB-92AF-4B7B-9DD6-3B39148898B9}.Debug|ARM.ActiveCfg = Debug|Any CPU
{891389AB-92AF-4B7B-9DD6-3B39148898B9}.Debug|ARM.Build.0 = Debug|Any CPU
{891389AB-92AF-4B7B-9DD6-3B39148898B9}.Debug|ARM64.ActiveCfg = Debug|Any CPU
{891389AB-92AF-4B7B-9DD6-3B39148898B9}.Debug|ARM64.Build.0 = Debug|Any CPU
{891389AB-92AF-4B7B-9DD6-3B39148898B9}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{891389AB-92AF-4B7B-9DD6-3B39148898B9}.Debug|iPhone.Build.0 = Debug|Any CPU
{891389AB-92AF-4B7B-9DD6-3B39148898B9}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{891389AB-92AF-4B7B-9DD6-3B39148898B9}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{891389AB-92AF-4B7B-9DD6-3B39148898B9}.Debug|x64.ActiveCfg = Debug|Any CPU
{891389AB-92AF-4B7B-9DD6-3B39148898B9}.Debug|x64.Build.0 = Debug|Any CPU
{891389AB-92AF-4B7B-9DD6-3B39148898B9}.Debug|x86.ActiveCfg = Debug|Any CPU
{891389AB-92AF-4B7B-9DD6-3B39148898B9}.Debug|x86.Build.0 = Debug|Any CPU
{891389AB-92AF-4B7B-9DD6-3B39148898B9}.Release|Any CPU.ActiveCfg = Release|Any CPU
{891389AB-92AF-4B7B-9DD6-3B39148898B9}.Release|Any CPU.Build.0 = Release|Any CPU
{891389AB-92AF-4B7B-9DD6-3B39148898B9}.Release|ARM.ActiveCfg = Release|Any CPU
{891389AB-92AF-4B7B-9DD6-3B39148898B9}.Release|ARM.Build.0 = Release|Any CPU
{891389AB-92AF-4B7B-9DD6-3B39148898B9}.Release|ARM64.ActiveCfg = Release|Any CPU
{891389AB-92AF-4B7B-9DD6-3B39148898B9}.Release|ARM64.Build.0 = Release|Any CPU
{891389AB-92AF-4B7B-9DD6-3B39148898B9}.Release|iPhone.ActiveCfg = Release|Any CPU
{891389AB-92AF-4B7B-9DD6-3B39148898B9}.Release|iPhone.Build.0 = Release|Any CPU
{891389AB-92AF-4B7B-9DD6-3B39148898B9}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{891389AB-92AF-4B7B-9DD6-3B39148898B9}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{891389AB-92AF-4B7B-9DD6-3B39148898B9}.Release|x64.ActiveCfg = Release|Any CPU
{891389AB-92AF-4B7B-9DD6-3B39148898B9}.Release|x64.Build.0 = Release|Any CPU
{891389AB-92AF-4B7B-9DD6-3B39148898B9}.Release|x86.ActiveCfg = Release|Any CPU
{891389AB-92AF-4B7B-9DD6-3B39148898B9}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{D4931444-94DD-49C6-8AFC-2228CDBDD5EA} = {C3FDCDB7-0C29-472D-A406-E2F21A4B0EAE}
{F193CE01-DF8B-4BC1-B9D5-C259455F61D6} = {C3FDCDB7-0C29-472D-A406-E2F21A4B0EAE}
{9EC9659F-FF70-469F-A6E2-011F4B42787F} = {AF80EA4A-ED76-4B9D-B6F9-971E2CBD016E}
{7DB9FB7D-F863-42B9-A6CD-E555C387C248} = {AF80EA4A-ED76-4B9D-B6F9-971E2CBD016E}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {0653DB4A-5BBE-4D78-99B2-DB1C82663246}

Просмотреть файл

@ -1,5 +0,0 @@
<Project>
<PropertyGroup>
<MauiVersion>6.0.312</MauiVersion>
</PropertyGroup>
</Project>

Просмотреть файл

@ -6,6 +6,7 @@
<RootNamespace>CometSample</RootNamespace>
<SingleProject>true</SingleProject>
<IsPackable>false</IsPackable>
<UseMaui>true</UseMaui>
<EnablePreviewMsixTooling>true</EnablePreviewMsixTooling>
<!-- Display name -->
<ApplicationTitle>CometSample</ApplicationTitle>
@ -20,6 +21,9 @@
<WarningsNotAsErrors>CA1416</WarningsNotAsErrors>
<NoWarn>1701;1702;0649;</NoWarn>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net6.0-ios|AnyCPU'">
<EnableCodeSigning>false</EnableCodeSigning>
</PropertyGroup>
<ItemGroup Condition=" $(TargetFramework.Contains('-windows')) ">
<PackageReference Include="Microsoft.WindowsAppSDK" />
</ItemGroup>
@ -34,10 +38,12 @@
<MauiFont Include="Resources\Fonts\*" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Reloadify3000" Version="1.0.8"/>
<ProjectReference Include="..\..\src\Comet\Comet.debug.csproj" />
<ProjectReference Include="..\..\external\Maui\src\Core\src\Core.csproj" />
<ProjectReference Include="..\..\external\Maui\src\Essentials\src\Essentials.csproj" />
<PackageReference Include="Reloadify3000" Version="1.0.8" />
<ProjectReference Include="..\..\src\Comet\Comet.csproj" />
</ItemGroup>
<ProjectExtensions><VisualStudio><UserProperties XamarinHotReloadDebuggerTimeoutExceptionCometSingleProjectSampleHideInfoBar="True" /></VisualStudio></ProjectExtensions>
<ProjectExtensions>
<VisualStudio>
<UserProperties XamarinHotReloadDebuggerTimeoutExceptionCometSingleProjectSampleHideInfoBar="True" />
</VisualStudio>
</ProjectExtensions>
</Project>

Просмотреть файл

@ -1,8 +0,0 @@
<Project>
<PropertyGroup>
<SampleProject>true</SampleProject>
<UseMaui Condition=" '$(UseWorkload)' == 'true' ">true</UseMaui>
</PropertyGroup>
<Import Project="../../External/Maui/Directory.Build.props" />
</Project>

Просмотреть файл

@ -1,5 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<Project>
<Import Project="../../External/Maui/src/Maui.InTree.targets"/>
<Import Project="../../External/Maui/Directory.Build.targets" />
</Project>

Просмотреть файл

@ -57,6 +57,7 @@ namespace Comet
{ typeof(FlyoutView), typeof(FlyoutViewHandler) },
{ typeof(GraphicsView), typeof(GraphicsViewHandler) },
{ typeof(Image) , typeof(ImageHandler) },
{ typeof(ImageButton) , typeof(ImageButtonHandler) },
//{ typeof(Picker), typeof(PickerHandler) },
{ typeof(ProgressBar), typeof(ProgressBarHandler) },
{ typeof(SearchBar), typeof(SearchBarHandler) },

Просмотреть файл

@ -1,5 +1,5 @@
<?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>
@ -11,16 +11,17 @@
<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>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\Comet.SourceGenerator\Comet.SourceGenerator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
<ProjectReference Include="..\Comet.SourceGenerator\Comet.SourceGenerator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false">
<ReferenceSourceTarget>
</ReferenceSourceTarget>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1"><IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
</ItemGroup>
</Project>
</Project>

Просмотреть файл

@ -5,7 +5,7 @@ using Microsoft.Maui;
using Comet;
//Property:NewPropertyName=DefaultValue
[assembly: CometGenerate(typeof(ITextButton), nameof(ITextButton.Text), nameof(IButton.Clicked), ClassName = "Button", Skip = new[] { $"{nameof(ITextStyle.TextColor)}:{EnvironmentKeys.Colors.Color}" }, Namespace = "Comet")]
//[assembly: CometGenerate(typeof(IImageButton), nameof(IImageButton.Source), nameof(IButton.Clicked), ClassName = "ImageButton", Namespace = "Comet")]
[assembly: CometGenerate(typeof(IImageButton), nameof(IImageButton.Source), nameof(IButton.Clicked), ClassName = "ImageButton", Namespace = "Comet")]
//[assembly: CometGenerate(typeof(IBorder), BaseClass = "ContentView", Namespace = "Comet")]
[assembly: CometGenerate(typeof(IIndicatorView), nameof(IIndicatorView.Count), ClassName = "IndicatorView", Namespace = "Comet")]

Просмотреть файл

@ -0,0 +1,62 @@
using System;
using System.Collections.Generic;
using Comet.Graphics;
using Microsoft.Maui;
using Microsoft.Maui.Graphics;
namespace Comet
{
public partial class ImageButton : View, Microsoft.Maui.IImageButton
{
protected static Dictionary<string, string> ImageButtonHandlerPropertyMapper = new(HandlerPropertyMapper)
{
[nameof(ImageSource)] = nameof(IImageSourcePart.Source),
};
public ImageButton(Binding<string> source, Action clicked = null)
{
StringSource = source;
Clicked = clicked;
}
public ImageButton(Func<string> source, Action clicked = null) : this((Binding<string>)source, clicked) { }
private Binding<string> _source;
public Binding<string> StringSource
{
get => _source;
protected set
{
this.SetBindingValue(ref _source, value);
CreateImageSource(_source.CurrentValue);
}
}
public override void ViewPropertyChanged(string property, object value)
{
base.ViewPropertyChanged(property, value);
if (property == nameof(StringSource))
{
InvalidateMeasurement();
CreateImageSource((string)value);
}
}
private void CreateImageSource(string source)
{
try
{
this.source ??= new Binding<IImageSource>();
this.source.Set((ImageSource)source);
ViewHandler?.UpdateValue(nameof(IImageSourcePart.Source));
}
catch (Exception exc)
{
Logger.Warn("An unexpected error occurred loading a bitmap.", exc);
}
}
protected override string GetHandlerPropertyName(string property)
=> ImageButtonHandlerPropertyMapper.TryGetValue(property, out var value) ? value : property;
}
}