DeGsoft
/
maui-linux
зеркало из https://github.com/DeGsoft/maui-linux.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность
maui-linux/Microsoft.Maui-net6.sln

174 строки
13 KiB
Plaintext
Исходник Обычный вид История

Setup Maui.sln with a set of net6 projects (#13433) * net6 projects * - additional * - net6 nullable fixes * - provision sdks * - net6.0 * - change to 5.0.0 * - update cake provisioning * - net6 fixes * - fix up platform heads * - fix global.json * - add net6 nuget feeds * - fix up platform heads and net6 if defs * - simplify * - add dotnet core build of maui sln * - update readme * - net6 yaml target * - remove net6 build from nuget * - simplify provisioning * - write json file * - net6 via yaml * - fix parameters * - more boots * - yaml * - base yaml pipeline off net6-samples * - yaml yaml yaml * - mac yaml * - add binlogs * - set AndroidRestoreOnBuild to false * - browser assembly * - fix artifacts directories * - fix NET6 artifacts * - update to preview bits * Update handlers.yml * [Build]Deploy android sample app * - restore from devops config Co-authored-by: Rui Marinho <me@ruimarinho.net>
2021-02-11 01:24:09 +03:00
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.30926.220
MinimumVisualStudioVersion = 10.0.40219.1
Rename all of the things... All of them. (#13847) * Rename all the things! * Fix sln on cake * targets * Rename all the things! * Fix sln on cake * Add this back so the build works * Added .nuspec\* back * Remove Core from XamlC * Update Build.Tasks * Fix ErrorMessages * Try fix build * Update gitignore * Update Microsoft.Maui-net6.sln * Fix controlgallery reference * Fix Maui reference on iOS sample * Fix ControLGallery sln * Fix xaml unit tests * Fix Maps references * Fix ControlGallery * Don't build gallery * Compile 462 for new * Dont build UAP * AndroidUseIntermediateDesignerFile * Fix UAP * Don't build control gallery for now Co-authored-by: Rui Marinho <me@ruimarinho.net> Co-authored-by: Matthew Leibowitz <mattleibow@live.com>
2021-02-25 02:50:31 +03:00
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core-net6", "src\Core\src\Core-net6.csproj", "{95BA42B5-B00E-4986-B9B5-517140378452}"
Setup Maui.sln with a set of net6 projects (#13433) * net6 projects * - additional * - net6 nullable fixes * - provision sdks * - net6.0 * - change to 5.0.0 * - update cake provisioning * - net6 fixes * - fix up platform heads * - fix global.json * - add net6 nuget feeds * - fix up platform heads and net6 if defs * - simplify * - add dotnet core build of maui sln * - update readme * - net6 yaml target * - remove net6 build from nuget * - simplify provisioning * - write json file * - net6 via yaml * - fix parameters * - more boots * - yaml * - base yaml pipeline off net6-samples * - yaml yaml yaml * - mac yaml * - add binlogs * - set AndroidRestoreOnBuild to false * - browser assembly * - fix artifacts directories * - fix NET6 artifacts * - update to preview bits * Update handlers.yml * [Build]Deploy android sample app * - restore from devops config Co-authored-by: Rui Marinho <me@ruimarinho.net>
2021-02-11 01:24:09 +03:00
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Files", "Files", "{449F6071-A74F-4309-8D7B-7038CFD1B17B}"
ProjectSection(SolutionItems) = preProject
Rename all of the things... All of them. (#13847) * Rename all the things! * Fix sln on cake * targets * Rename all the things! * Fix sln on cake * Add this back so the build works * Added .nuspec\* back * Remove Core from XamlC * Update Build.Tasks * Fix ErrorMessages * Try fix build * Update gitignore * Update Microsoft.Maui-net6.sln * Fix controlgallery reference * Fix Maui reference on iOS sample * Fix ControLGallery sln * Fix xaml unit tests * Fix Maps references * Fix ControlGallery * Don't build gallery * Compile 462 for new * Dont build UAP * AndroidUseIntermediateDesignerFile * Fix UAP * Don't build control gallery for now Co-authored-by: Rui Marinho <me@ruimarinho.net> Co-authored-by: Matthew Leibowitz <mattleibow@live.com>
2021-02-25 02:50:31 +03:00
.nuspec\Microsoft.Maui.Controls.MultiTargeting.targets = .nuspec\Microsoft.Maui.Controls.MultiTargeting.targets
Setup Maui.sln with a set of net6 projects (#13433) * net6 projects * - additional * - net6 nullable fixes * - provision sdks * - net6.0 * - change to 5.0.0 * - update cake provisioning * - net6 fixes * - fix up platform heads * - fix global.json * - add net6 nuget feeds * - fix up platform heads and net6 if defs * - simplify * - add dotnet core build of maui sln * - update readme * - net6 yaml target * - remove net6 build from nuget * - simplify provisioning * - write json file * - net6 via yaml * - fix parameters * - more boots * - yaml * - base yaml pipeline off net6-samples * - yaml yaml yaml * - mac yaml * - add binlogs * - set AndroidRestoreOnBuild to false * - browser assembly * - fix artifacts directories * - fix NET6 artifacts * - update to preview bits * Update handlers.yml * [Build]Deploy android sample app * - restore from devops config Co-authored-by: Rui Marinho <me@ruimarinho.net>
2021-02-11 01:24:09 +03:00
README.md = README.md
EndProjectSection
EndProject
Rename all of the things... All of them. (#13847) * Rename all the things! * Fix sln on cake * targets * Rename all the things! * Fix sln on cake * Add this back so the build works * Added .nuspec\* back * Remove Core from XamlC * Update Build.Tasks * Fix ErrorMessages * Try fix build * Update gitignore * Update Microsoft.Maui-net6.sln * Fix controlgallery reference * Fix Maui reference on iOS sample * Fix ControLGallery sln * Fix xaml unit tests * Fix Maps references * Fix ControlGallery * Don't build gallery * Compile 462 for new * Dont build UAP * AndroidUseIntermediateDesignerFile * Fix UAP * Don't build control gallery for now Co-authored-by: Rui Marinho <me@ruimarinho.net> Co-authored-by: Matthew Leibowitz <mattleibow@live.com>
2021-02-25 02:50:31 +03:00
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Controls.Core-net6", "src\Controls\src\Core\Controls.Core-net6.csproj", "{AF64451F-E2BD-41C2-B083-F60C26AE2A9F}"
Setup Maui.sln with a set of net6 projects (#13433) * net6 projects * - additional * - net6 nullable fixes * - provision sdks * - net6.0 * - change to 5.0.0 * - update cake provisioning * - net6 fixes * - fix up platform heads * - fix global.json * - add net6 nuget feeds * - fix up platform heads and net6 if defs * - simplify * - add dotnet core build of maui sln * - update readme * - net6 yaml target * - remove net6 build from nuget * - simplify provisioning * - write json file * - net6 via yaml * - fix parameters * - more boots * - yaml * - base yaml pipeline off net6-samples * - yaml yaml yaml * - mac yaml * - add binlogs * - set AndroidRestoreOnBuild to false * - browser assembly * - fix artifacts directories * - fix NET6 artifacts * - update to preview bits * Update handlers.yml * [Build]Deploy android sample app * - restore from devops config Co-authored-by: Rui Marinho <me@ruimarinho.net>
2021-02-11 01:24:09 +03:00
EndProject
Rename all of the things... All of them. (#13847) * Rename all the things! * Fix sln on cake * targets * Rename all the things! * Fix sln on cake * Add this back so the build works * Added .nuspec\* back * Remove Core from XamlC * Update Build.Tasks * Fix ErrorMessages * Try fix build * Update gitignore * Update Microsoft.Maui-net6.sln * Fix controlgallery reference * Fix Maui reference on iOS sample * Fix ControLGallery sln * Fix xaml unit tests * Fix Maps references * Fix ControlGallery * Don't build gallery * Compile 462 for new * Dont build UAP * AndroidUseIntermediateDesignerFile * Fix UAP * Don't build control gallery for now Co-authored-by: Rui Marinho <me@ruimarinho.net> Co-authored-by: Matthew Leibowitz <mattleibow@live.com>
2021-02-25 02:50:31 +03:00
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Compatibility-net6", "src\Compatibility\Core\src\Compatibility-net6.csproj", "{00A11C2F-969F-4964-8557-91ADF4B1523D}"
Net6 platforms (#13737) * NET6 changes * - Forms View Group Binding * - fix * - fix ios * - net6 fixes * - just enable ios * - android compile fixes * - add type * - fix comment for net6 * - fix menu * - explicit
2021-02-14 17:21:33 +03:00
EndProject
Rename all of the things... All of them. (#13847) * Rename all the things! * Fix sln on cake * targets * Rename all the things! * Fix sln on cake * Add this back so the build works * Added .nuspec\* back * Remove Core from XamlC * Update Build.Tasks * Fix ErrorMessages * Try fix build * Update gitignore * Update Microsoft.Maui-net6.sln * Fix controlgallery reference * Fix Maui reference on iOS sample * Fix ControLGallery sln * Fix xaml unit tests * Fix Maps references * Fix ControlGallery * Don't build gallery * Compile 462 for new * Dont build UAP * AndroidUseIntermediateDesignerFile * Fix UAP * Don't build control gallery for now Co-authored-by: Rui Marinho <me@ruimarinho.net> Co-authored-by: Matthew Leibowitz <mattleibow@live.com>
2021-02-25 02:50:31 +03:00
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Compatibility.Android.FormsViewGroup-net6", "src\Compatibility\Core\src\Android.FormsViewGroup\Compatibility.Android.FormsViewGroup-net6.csproj", "{EB956381-F3E6-437C-9069-36B8BF5C6E2F}"
Net6 platforms (#13737) * NET6 changes * - Forms View Group Binding * - fix * - fix ios * - net6 fixes * - just enable ios * - android compile fixes * - add type * - fix comment for net6 * - fix menu * - explicit
2021-02-14 17:21:33 +03:00
EndProject
Make .NET 6 Packable (#13881) * Add some common nupkg properties to everything * Remove project property refactored into directory build props * Remove properties now in common dir build props * Add net6 version of project * More net6 * Only target netstandard2.0 now net4* is no longer needed as there's no more vs2017 support * Clean up strong naming a bit * Update dependencies * Package all the things for build tasks in the -t:Pack * Add more net6 project versions * Clean up whitespace * Needed moar NET6 * Name fixes * Added meta project for packaging and package script * Remove assembly copyright (now duplicates) * Add resizetizer, add params to package script * Disable strong naming for now We need to re-evaluate how we do this a bit, we should probably use the `al` tool to do it now, and I believe the StrongNamer package may not work anymore, but we can do the same thing in a custom target at a later date. * Fix path to tasks assembly * don't build ios on android specific project * Finish rename of toolbox file * - add cake * - fix cake extras * fix the copy for the IDE * Try packing on CI * versions baby! * build release * this should od it * this * oops * Move to an empty folder * Use new symbol formats * no symbols for build tasks and the head * symbol all the things * Compiler error with commented out code XD * oopsies * only build transitive * Try this * log everything * This might work * REPORTS * previews * needed * versions * duh * Update build.cake Co-authored-by: Shane Neuville <shneuvil@microsoft.com> Co-authored-by: Matthew Leibowitz <mattleibow@live.com>
2021-03-02 20:36:17 +03:00
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Controls", "Controls", "{459BF674-83CB-46F6-881F-A2D2117DBF4D}"
[Handlers] Register handlers and use Microsoft.Extensions for Hosting and Dependency Injection (#12460) * [Core,Android,iOS] Add AppBuilder and AppHost and sample and tests * [eng] Add script to measure android startup * Update src/Platform.Handlers/tests/Xamarin.Platform.Handlers.Benchmarks/HandlersBenchmarker.cs Co-authored-by: Pedro Jesus <pedrojesus.cefet@gmail.com> * [Sample ] Update sample code * [Tests] Fix hosting tests * Small cleanup * [handlers] Add Window and cleanup hosting * [Controls] Remove xf button * [Hosting] Remove AppLifetiem for now * Fix sample code * [Build] Fix rebase * [Test] Fix test * [Build] Remove reference to http package * [Handlers] Rework Hosting, add option to override ServiceCollection and ServiceProvider, remove usage of Extensions DI * [Hosting] Refactor to use extensions and rename some Stubs * [Hosting] Small refactor * [Hosting] Fix null reference usage on .net6 * [Samples] Install DI extension package on net6 samples * [Sample] Add Maui.Controls.Sample * Fix props * [Sample] Fix sample move to Shared folder * Revert "[Sample] Fix sample move to Shared folder" This reverts commit 88980f527be91c028db6b1667a3cf39401ac5757. * Revert "Fix props" This reverts commit 3f8467d8251d8b3b7aee8fe3b5e01bbf0711ea6a. * Revert "[Sample] Add Maui.Controls.Sample" This reverts commit 3d0ad41544fc8e0ee60d352a028f69bce96e6d8f. * [Hosting] Add Configuration support * [Hosting]Add Maui.Controls sample * [Hosting]Fix sln * [Hosting] Add net6 Maui.Controls.Sample * Cleanup * More cleanup * Implement iAPP on old sample * [Hosting] Fix build * [Hosting] Just use forms on sample , add GetWindow to IApp * [Hosting] Add HandlersContext to App * [Hosting] Add MauiAppCompatActivity * [Hosting] Move HandlersContext to Window * Remove extra files * [Hosting] Add MauiApp * Fix build * Update Maui.Controls.Sample.iOS-net6.csproj * Update AssemblyInfo.cs * Update Maui.Controls.Sample-net6.csproj * [Hosting] Be able to run old and new registrar * Add Android resources * [Android] Add xml resources * Fix * Fix unit tests * [Application] Fix net6 nre * Cleanuo * Fix build again * [Samples] Add essentials init * Fix net6 build * - update packagese * - add handler renderer shim * - fix link references * Fix running app on Android * - fix missing using * - shim sample * - add another helper * [Hosting] Save context on App for now * [Handlers] Fix sample register ISwitch * [Hosting] Some renaming * - delete samples * - fix CG * [Hosting] Remove old registrar code * Remove FormsHandlers * TODO: Implement legacy attribute scanner with AppHostBuilder * Fix build * Enable nullable * fix formatting * Fix using old registrar * use c# 9 * Try fix #nullable * Don't disable nullable warnings Use the null-forgiving operator (!) to rather swear that we doin' good * Fixed the benchmarks and tests with new code Also split the benchmarks into separate classes for better comparison. * Fixing some merge issues * Remove usage of FormsHandlers * [Hosting] Small refactor , fixing same names * remove this * [Hosting] Fix MauiHandlersServiceProvider Co-authored-by: Pedro Jesus <pedrojesus.cefet@gmail.com> Co-authored-by: Shane Neuville <shneuvil@microsoft.com> Co-authored-by: Matthew Leibowitz <mattleibow@live.com>
2021-02-23 23:05:46 +03:00
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{E1082E26-D700-4127-9329-66D673FD2D55}"
EndProject
Rename all of the things... All of them. (#13847) * Rename all the things! * Fix sln on cake * targets * Rename all the things! * Fix sln on cake * Add this back so the build works * Added .nuspec\* back * Remove Core from XamlC * Update Build.Tasks * Fix ErrorMessages * Try fix build * Update gitignore * Update Microsoft.Maui-net6.sln * Fix controlgallery reference * Fix Maui reference on iOS sample * Fix ControLGallery sln * Fix xaml unit tests * Fix Maps references * Fix ControlGallery * Don't build gallery * Compile 462 for new * Dont build UAP * AndroidUseIntermediateDesignerFile * Fix UAP * Don't build control gallery for now Co-authored-by: Rui Marinho <me@ruimarinho.net> Co-authored-by: Matthew Leibowitz <mattleibow@live.com>
2021-02-25 02:50:31 +03:00
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Maui.Controls.Sample-net6", "src\Controls\samples\Controls.Sample\Maui.Controls.Sample-net6.csproj", "{B8DC1324-977C-46F1-B697-9064ADE6099A}"
[Handlers] Register handlers and use Microsoft.Extensions for Hosting and Dependency Injection (#12460) * [Core,Android,iOS] Add AppBuilder and AppHost and sample and tests * [eng] Add script to measure android startup * Update src/Platform.Handlers/tests/Xamarin.Platform.Handlers.Benchmarks/HandlersBenchmarker.cs Co-authored-by: Pedro Jesus <pedrojesus.cefet@gmail.com> * [Sample ] Update sample code * [Tests] Fix hosting tests * Small cleanup * [handlers] Add Window and cleanup hosting * [Controls] Remove xf button * [Hosting] Remove AppLifetiem for now * Fix sample code * [Build] Fix rebase * [Test] Fix test * [Build] Remove reference to http package * [Handlers] Rework Hosting, add option to override ServiceCollection and ServiceProvider, remove usage of Extensions DI * [Hosting] Refactor to use extensions and rename some Stubs * [Hosting] Small refactor * [Hosting] Fix null reference usage on .net6 * [Samples] Install DI extension package on net6 samples * [Sample] Add Maui.Controls.Sample * Fix props * [Sample] Fix sample move to Shared folder * Revert "[Sample] Fix sample move to Shared folder" This reverts commit 88980f527be91c028db6b1667a3cf39401ac5757. * Revert "Fix props" This reverts commit 3f8467d8251d8b3b7aee8fe3b5e01bbf0711ea6a. * Revert "[Sample] Add Maui.Controls.Sample" This reverts commit 3d0ad41544fc8e0ee60d352a028f69bce96e6d8f. * [Hosting] Add Configuration support * [Hosting]Add Maui.Controls sample * [Hosting]Fix sln * [Hosting] Add net6 Maui.Controls.Sample * Cleanup * More cleanup * Implement iAPP on old sample * [Hosting] Fix build * [Hosting] Just use forms on sample , add GetWindow to IApp * [Hosting] Add HandlersContext to App * [Hosting] Add MauiAppCompatActivity * [Hosting] Move HandlersContext to Window * Remove extra files * [Hosting] Add MauiApp * Fix build * Update Maui.Controls.Sample.iOS-net6.csproj * Update AssemblyInfo.cs * Update Maui.Controls.Sample-net6.csproj * [Hosting] Be able to run old and new registrar * Add Android resources * [Android] Add xml resources * Fix * Fix unit tests * [Application] Fix net6 nre * Cleanuo * Fix build again * [Samples] Add essentials init * Fix net6 build * - update packagese * - add handler renderer shim * - fix link references * Fix running app on Android * - fix missing using * - shim sample * - add another helper * [Hosting] Save context on App for now * [Handlers] Fix sample register ISwitch * [Hosting] Some renaming * - delete samples * - fix CG * [Hosting] Remove old registrar code * Remove FormsHandlers * TODO: Implement legacy attribute scanner with AppHostBuilder * Fix build * Enable nullable * fix formatting * Fix using old registrar * use c# 9 * Try fix #nullable * Don't disable nullable warnings Use the null-forgiving operator (!) to rather swear that we doin' good * Fixed the benchmarks and tests with new code Also split the benchmarks into separate classes for better comparison. * Fixing some merge issues * Remove usage of FormsHandlers * [Hosting] Small refactor , fixing same names * remove this * [Hosting] Fix MauiHandlersServiceProvider Co-authored-by: Pedro Jesus <pedrojesus.cefet@gmail.com> Co-authored-by: Shane Neuville <shneuvil@microsoft.com> Co-authored-by: Matthew Leibowitz <mattleibow@live.com>
2021-02-23 23:05:46 +03:00
EndProject
Rename all of the things... All of them. (#13847) * Rename all the things! * Fix sln on cake * targets * Rename all the things! * Fix sln on cake * Add this back so the build works * Added .nuspec\* back * Remove Core from XamlC * Update Build.Tasks * Fix ErrorMessages * Try fix build * Update gitignore * Update Microsoft.Maui-net6.sln * Fix controlgallery reference * Fix Maui reference on iOS sample * Fix ControLGallery sln * Fix xaml unit tests * Fix Maps references * Fix ControlGallery * Don't build gallery * Compile 462 for new * Dont build UAP * AndroidUseIntermediateDesignerFile * Fix UAP * Don't build control gallery for now Co-authored-by: Rui Marinho <me@ruimarinho.net> Co-authored-by: Matthew Leibowitz <mattleibow@live.com>
2021-02-25 02:50:31 +03:00
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Maui.Controls.Sample.Droid-net6", "src\Controls\samples\Controls.Sample.Droid\Maui.Controls.Sample.Droid-net6.csproj", "{BE50FAEF-4096-48B5-B9CE-EE0C38F15A18}"
[Handlers] Register handlers and use Microsoft.Extensions for Hosting and Dependency Injection (#12460) * [Core,Android,iOS] Add AppBuilder and AppHost and sample and tests * [eng] Add script to measure android startup * Update src/Platform.Handlers/tests/Xamarin.Platform.Handlers.Benchmarks/HandlersBenchmarker.cs Co-authored-by: Pedro Jesus <pedrojesus.cefet@gmail.com> * [Sample ] Update sample code * [Tests] Fix hosting tests * Small cleanup * [handlers] Add Window and cleanup hosting * [Controls] Remove xf button * [Hosting] Remove AppLifetiem for now * Fix sample code * [Build] Fix rebase * [Test] Fix test * [Build] Remove reference to http package * [Handlers] Rework Hosting, add option to override ServiceCollection and ServiceProvider, remove usage of Extensions DI * [Hosting] Refactor to use extensions and rename some Stubs * [Hosting] Small refactor * [Hosting] Fix null reference usage on .net6 * [Samples] Install DI extension package on net6 samples * [Sample] Add Maui.Controls.Sample * Fix props * [Sample] Fix sample move to Shared folder * Revert "[Sample] Fix sample move to Shared folder" This reverts commit 88980f527be91c028db6b1667a3cf39401ac5757. * Revert "Fix props" This reverts commit 3f8467d8251d8b3b7aee8fe3b5e01bbf0711ea6a. * Revert "[Sample] Add Maui.Controls.Sample" This reverts commit 3d0ad41544fc8e0ee60d352a028f69bce96e6d8f. * [Hosting] Add Configuration support * [Hosting]Add Maui.Controls sample * [Hosting]Fix sln * [Hosting] Add net6 Maui.Controls.Sample * Cleanup * More cleanup * Implement iAPP on old sample * [Hosting] Fix build * [Hosting] Just use forms on sample , add GetWindow to IApp * [Hosting] Add HandlersContext to App * [Hosting] Add MauiAppCompatActivity * [Hosting] Move HandlersContext to Window * Remove extra files * [Hosting] Add MauiApp * Fix build * Update Maui.Controls.Sample.iOS-net6.csproj * Update AssemblyInfo.cs * Update Maui.Controls.Sample-net6.csproj * [Hosting] Be able to run old and new registrar * Add Android resources * [Android] Add xml resources * Fix * Fix unit tests * [Application] Fix net6 nre * Cleanuo * Fix build again * [Samples] Add essentials init * Fix net6 build * - update packagese * - add handler renderer shim * - fix link references * Fix running app on Android * - fix missing using * - shim sample * - add another helper * [Hosting] Save context on App for now * [Handlers] Fix sample register ISwitch * [Hosting] Some renaming * - delete samples * - fix CG * [Hosting] Remove old registrar code * Remove FormsHandlers * TODO: Implement legacy attribute scanner with AppHostBuilder * Fix build * Enable nullable * fix formatting * Fix using old registrar * use c# 9 * Try fix #nullable * Don't disable nullable warnings Use the null-forgiving operator (!) to rather swear that we doin' good * Fixed the benchmarks and tests with new code Also split the benchmarks into separate classes for better comparison. * Fixing some merge issues * Remove usage of FormsHandlers * [Hosting] Small refactor , fixing same names * remove this * [Hosting] Fix MauiHandlersServiceProvider Co-authored-by: Pedro Jesus <pedrojesus.cefet@gmail.com> Co-authored-by: Shane Neuville <shneuvil@microsoft.com> Co-authored-by: Matthew Leibowitz <mattleibow@live.com>
2021-02-23 23:05:46 +03:00
EndProject
Rename all of the things... All of them. (#13847) * Rename all the things! * Fix sln on cake * targets * Rename all the things! * Fix sln on cake * Add this back so the build works * Added .nuspec\* back * Remove Core from XamlC * Update Build.Tasks * Fix ErrorMessages * Try fix build * Update gitignore * Update Microsoft.Maui-net6.sln * Fix controlgallery reference * Fix Maui reference on iOS sample * Fix ControLGallery sln * Fix xaml unit tests * Fix Maps references * Fix ControlGallery * Don't build gallery * Compile 462 for new * Dont build UAP * AndroidUseIntermediateDesignerFile * Fix UAP * Don't build control gallery for now Co-authored-by: Rui Marinho <me@ruimarinho.net> Co-authored-by: Matthew Leibowitz <mattleibow@live.com>
2021-02-25 02:50:31 +03:00
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Maui.Controls.Sample.iOS-net6", "src\Controls\samples\Controls.Sample.iOS\Maui.Controls.Sample.iOS-net6.csproj", "{1C3439E6-73D7-4F8E-A64A-5448F5CB18DE}"
[Handlers] Register handlers and use Microsoft.Extensions for Hosting and Dependency Injection (#12460) * [Core,Android,iOS] Add AppBuilder and AppHost and sample and tests * [eng] Add script to measure android startup * Update src/Platform.Handlers/tests/Xamarin.Platform.Handlers.Benchmarks/HandlersBenchmarker.cs Co-authored-by: Pedro Jesus <pedrojesus.cefet@gmail.com> * [Sample ] Update sample code * [Tests] Fix hosting tests * Small cleanup * [handlers] Add Window and cleanup hosting * [Controls] Remove xf button * [Hosting] Remove AppLifetiem for now * Fix sample code * [Build] Fix rebase * [Test] Fix test * [Build] Remove reference to http package * [Handlers] Rework Hosting, add option to override ServiceCollection and ServiceProvider, remove usage of Extensions DI * [Hosting] Refactor to use extensions and rename some Stubs * [Hosting] Small refactor * [Hosting] Fix null reference usage on .net6 * [Samples] Install DI extension package on net6 samples * [Sample] Add Maui.Controls.Sample * Fix props * [Sample] Fix sample move to Shared folder * Revert "[Sample] Fix sample move to Shared folder" This reverts commit 88980f527be91c028db6b1667a3cf39401ac5757. * Revert "Fix props" This reverts commit 3f8467d8251d8b3b7aee8fe3b5e01bbf0711ea6a. * Revert "[Sample] Add Maui.Controls.Sample" This reverts commit 3d0ad41544fc8e0ee60d352a028f69bce96e6d8f. * [Hosting] Add Configuration support * [Hosting]Add Maui.Controls sample * [Hosting]Fix sln * [Hosting] Add net6 Maui.Controls.Sample * Cleanup * More cleanup * Implement iAPP on old sample * [Hosting] Fix build * [Hosting] Just use forms on sample , add GetWindow to IApp * [Hosting] Add HandlersContext to App * [Hosting] Add MauiAppCompatActivity * [Hosting] Move HandlersContext to Window * Remove extra files * [Hosting] Add MauiApp * Fix build * Update Maui.Controls.Sample.iOS-net6.csproj * Update AssemblyInfo.cs * Update Maui.Controls.Sample-net6.csproj * [Hosting] Be able to run old and new registrar * Add Android resources * [Android] Add xml resources * Fix * Fix unit tests * [Application] Fix net6 nre * Cleanuo * Fix build again * [Samples] Add essentials init * Fix net6 build * - update packagese * - add handler renderer shim * - fix link references * Fix running app on Android * - fix missing using * - shim sample * - add another helper * [Hosting] Save context on App for now * [Handlers] Fix sample register ISwitch * [Hosting] Some renaming * - delete samples * - fix CG * [Hosting] Remove old registrar code * Remove FormsHandlers * TODO: Implement legacy attribute scanner with AppHostBuilder * Fix build * Enable nullable * fix formatting * Fix using old registrar * use c# 9 * Try fix #nullable * Don't disable nullable warnings Use the null-forgiving operator (!) to rather swear that we doin' good * Fixed the benchmarks and tests with new code Also split the benchmarks into separate classes for better comparison. * Fixing some merge issues * Remove usage of FormsHandlers * [Hosting] Small refactor , fixing same names * remove this * [Hosting] Fix MauiHandlersServiceProvider Co-authored-by: Pedro Jesus <pedrojesus.cefet@gmail.com> Co-authored-by: Shane Neuville <shneuvil@microsoft.com> Co-authored-by: Matthew Leibowitz <mattleibow@live.com>
2021-02-23 23:05:46 +03:00
EndProject
Improves Samples (#447)
2021-03-09 05:44:52 +03:00
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Maui.Controls.Sample.MacCatalyst-net6", "src\Controls\samples\Controls.Sample.MacCatalyst\Maui.Controls.Sample.MacCatalyst-net6.csproj", "{D7FE9FD0-144A-4199-93FC-3AD62325F1D6}"
EndProject
.NET Maui "Single Project" (#13858) Context: https://github.com/xamarin/xamarin-android/blob/fcd9c30164d4ac0e88440357b5c96b9fdebccb39/Documentation/guides/OneDotNetSingleProject.md We are aiming to get a new project type working that would have a `.csproj` such as: <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> <TargetFramework>net6.0-android;net6.0-ios</TargetFramework> <OutputType>Exe</OutputType> <SingleProject>true</SingleProject> </PropertyGroup> </Project> Within the project you would have: * `*.cs` all shared code * `iOS/*` - iOS only stuff, including `Info.plist` * `Android/*` - Android only stuff, including `AndroidManifest.xml` I also used some other new settings that results in a smaller `Info.plist` and `AndroidManifest.xml`: <ApplicationTitle>Single Project</ApplicationTitle> <ApplicationId>com.microsoft.maui.singleproject</ApplicationId> <ApplicationVersion>1.0</ApplicationVersion> <AndroidVersionCode>1</AndroidVersionCode> The eventual goal being we might be able to completely get rid of `Info.plist` and `AndroidManifest.xml` for simple apps. You would only need them for edge-case, platform-specific features. To get this working within a NuGet package, we can include two new files: * `Xamarin.Forms.SingleProject.props` * `Xamarin.Forms.SingleProject.targets` They only enable things conditionally, if `$(SingleProject)` is set. I created a new sample with a single `Label` to demonstrate things working.
2021-02-26 18:07:26 +03:00
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Maui.Controls.Sample.SingleProject", "src\Controls\samples\Controls.Sample.SingleProject\Maui.Controls.Sample.SingleProject.csproj", "{CB495F62-CFE6-4975-AED8-F26B6C5D0113}"
EndProject
Make .NET 6 Packable (#13881) * Add some common nupkg properties to everything * Remove project property refactored into directory build props * Remove properties now in common dir build props * Add net6 version of project * More net6 * Only target netstandard2.0 now net4* is no longer needed as there's no more vs2017 support * Clean up strong naming a bit * Update dependencies * Package all the things for build tasks in the -t:Pack * Add more net6 project versions * Clean up whitespace * Needed moar NET6 * Name fixes * Added meta project for packaging and package script * Remove assembly copyright (now duplicates) * Add resizetizer, add params to package script * Disable strong naming for now We need to re-evaluate how we do this a bit, we should probably use the `al` tool to do it now, and I believe the StrongNamer package may not work anymore, but we can do the same thing in a custom target at a later date. * Fix path to tasks assembly * don't build ios on android specific project * Finish rename of toolbox file * - add cake * - fix cake extras * fix the copy for the IDE * Try packing on CI * versions baby! * build release * this should od it * this * oops * Move to an empty folder * Use new symbol formats * no symbols for build tasks and the head * symbol all the things * Compiler error with commented out code XD * oopsies * only build transitive * Try this * log everything * This might work * REPORTS * previews * needed * versions * duh * Update build.cake Co-authored-by: Shane Neuville <shneuvil@microsoft.com> Co-authored-by: Matthew Leibowitz <mattleibow@live.com>
2021-03-02 20:36:17 +03:00
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Compatibility", "Compatibility", "{123AA89E-1638-4E0E-B828-B8F9F9F906A2}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core", "Core", "{09C264E9-E3F3-4586-9151-DCBB1F6DA7AB}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Controls.Build.Tasks-net6", "src\Controls\src\Build.Tasks\Controls.Build.Tasks-net6.csproj", "{75C380E0-CE53-4C01-B89F-CF685331DE18}"
EndProject
Pack Essentials net6 (#13925) * Build and pack essentials for net6 * Fix net6 pack for essentials * Fix a property * Pack net6 version of essentials
2021-03-03 19:12:28 +03:00
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Essentials", "Essentials", "{94F3C036-A5F4-4ACC-A028-8506802ADB88}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Essentials-net6", "src\Essentials\src\Essentials-net6.csproj", "{39B47A3C-21CA-4B28-9250-14FD957EB0FC}"
Build MAUI for MacCatalyst (#438) * Add Mac Catalyst to the CI * pack on mac just in case * test * Start adding catalyst support * first maccatalyst frameworks to testthe waters * oksy * this for future * revert * revert * Include maccatalyst for single project * Treat Catalyst mostly like iOS for now * Don't try fallback path for catalyst since API isn't there * Xib not needed anymore * Include iOS bits for catalyst on the compat project * Fix linebreak mode to not use deprecated API (for catalyst too) * Fix text/string attribute usage for catalyst/mac * Fixed string attribute usage for catalyst/mac * new toys * Fix Delegate cast for catalyst * Fix single project includes for catalyst * Remove scene delegate for now * Add catalyst specific assets for single project * fix things * Stop building catalyst on windows * hax * was bad hax * Use UIStringAttributes for iOS and Catalyst both * Do it right * Revert "Use UIStringAttributes for iOS and Catalyst both" This reverts commit 0d4b90aecb67c05432e04a1bde4a88e7405118d0. * Fix the build tasks Co-authored-by: Matthew Leibowitz <mattleibow@live.com> Co-authored-by: Jonathan Peppers <jonathan.peppers@microsoft.com>
2021-03-06 04:12:14 +03:00
EndProject
Enable unit tests (#13864) * [Build] Remove old steps * Fix reference of unit tests cspro * Enable xaml unit tests * [Build] Add build of xaml unit tests * Try fix targets * Fix Forms naming * More naming fixes * Revert versions * Remove .Core * More .Core removals and Fix Platform references * Add RootNamespace to Build.Tasks * Fix more Xamarin.Forms old usage * Fix dll on build.targets * Fix _XFBuildTasksLocation * More fixes to _MauiBuildTasksLocation * More fixes _MauiBuildTasksLocation * Fix _MauiBuildTasksLocation * remove debug info * Remove issues for now * Rename maps namespace * Fix Assembly tests * Fix more targets * More map rename fixes * Fix xaml reference on unit tests * Fix MauiXamlCValidateOnly naming * More MauiXamlCValidateOnly * Add xaml page to sample * Fix namespace on sample page * oh, yeah * Fix sample references * Try run on release the xaml unit tests * Try continueOnerror * Update build-windows.yml * added via the directory props * ws * We mights need this * I think I did this * This can be reused * 🤦‍♀️ * this as well after the peppers PR * Fix some bad renames * i see * Fix merge * Fix sample * Remove FromSource * Add the packages * this * Yaysies! * Fix all the non-msbuild tests * Adding things back and gallery * this * Build the tasks first * Got the Android control gallery running * remove from the sln * Xaml pages * Reference XAML * this * better XAML * this * restore * maybe * include correctly * symbols * Try set the versions * remove unused steps templates versions things more cool yay * Updating code to pre-fix xaml * Now we do the targets * Revert "Now we do the targets" This reverts commit 2ce4984d48a00c1eab8037cdd8a35690feb0038e. * maybe this? * We have to set the variables * Add the control gallery and xaml unit tests * This might help * xaml page * Try use matrix for build/release macOS * Fix variables * Fix end of script * use matrix for build on windows * Fix Artifact upload at same time Co-authored-by: Stephane Delcroix <stephane@delcroix.org> Co-authored-by: Matthew Leibowitz <mattleibow@live.com>
2021-03-03 18:20:03 +03:00
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SingleProject", "SingleProject", "{D5478E0A-5D9C-4C1F-980C-7A9FC71F925E}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Resizetizer", "src\SingleProject\Resizetizer\src\Resizetizer.csproj", "{9909F93F-C085-4F76-B92A-5D8C516BF47D}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Package-net6", "src\Package\Package-net6.csproj", "{5BEB3326-79B4-438C-BF65-274202F387EC}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Controls.Xaml-net6", "src\Controls\src\Xaml\Controls.Xaml-net6.csproj", "{CC3D4667-D94E-4276-9311-6439BFD075E4}"
EndProject
Move the templates into a separate folder (#614) - Move templates to /src/Templates - Add Core.UnitTests to net6 solution
2021-03-30 11:29:52 +03:00
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Maui.Templates", "src\Templates\src\Microsoft.Maui.Templates.csproj", "{DAAC2822-63B6-4DE0-83AE-04873CD2F364}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TestUtils", "TestUtils", "{6998CAA1-11D4-46B2-B80F-0AC882F58124}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtils", "src\TestUtils\TestUtils\src\TestUtils.csproj", "{FBB3270F-1924-4A72-845E-A6DF39C402F6}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core.UnitTests", "src\Core\tests\UnitTests\Core.UnitTests.csproj", "{92644F6F-5946-48FC-A21A-A3D6EE24E8B3}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E8AD265B-3C67-4640-AC58-A522F9FB3361}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{C564DDD6-DE79-45CD-88EA-3F690481572A}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{50C758FE-4E10-409A-94F5-A75480960864}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Templates", "Templates", "{72397ADB-40A8-4B8E-8E08-2DBE2803C845}"
.NET 6 maui-mobile template (#371)
2021-03-05 06:41:53 +03:00
EndProject
Setup Maui.sln with a set of net6 projects (#13433) * net6 projects * - additional * - net6 nullable fixes * - provision sdks * - net6.0 * - change to 5.0.0 * - update cake provisioning * - net6 fixes * - fix up platform heads * - fix global.json * - add net6 nuget feeds * - fix up platform heads and net6 if defs * - simplify * - add dotnet core build of maui sln * - update readme * - net6 yaml target * - remove net6 build from nuget * - simplify provisioning * - write json file * - net6 via yaml * - fix parameters * - more boots * - yaml * - base yaml pipeline off net6-samples * - yaml yaml yaml * - mac yaml * - add binlogs * - set AndroidRestoreOnBuild to false * - browser assembly * - fix artifacts directories * - fix NET6 artifacts * - update to preview bits * Update handlers.yml * [Build]Deploy android sample app * - restore from devops config Co-authored-by: Rui Marinho <me@ruimarinho.net>
2021-02-11 01:24:09 +03:00
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{95BA42B5-B00E-4986-B9B5-517140378452}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{95BA42B5-B00E-4986-B9B5-517140378452}.Debug|Any CPU.Build.0 = Debug|Any CPU
{95BA42B5-B00E-4986-B9B5-517140378452}.Release|Any CPU.ActiveCfg = Release|Any CPU
{95BA42B5-B00E-4986-B9B5-517140378452}.Release|Any CPU.Build.0 = Release|Any CPU
{AF64451F-E2BD-41C2-B083-F60C26AE2A9F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{AF64451F-E2BD-41C2-B083-F60C26AE2A9F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{AF64451F-E2BD-41C2-B083-F60C26AE2A9F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{AF64451F-E2BD-41C2-B083-F60C26AE2A9F}.Release|Any CPU.Build.0 = Release|Any CPU
Net6 platforms (#13737) * NET6 changes * - Forms View Group Binding * - fix * - fix ios * - net6 fixes * - just enable ios * - android compile fixes * - add type * - fix comment for net6 * - fix menu * - explicit
2021-02-14 17:21:33 +03:00
{00A11C2F-969F-4964-8557-91ADF4B1523D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{00A11C2F-969F-4964-8557-91ADF4B1523D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{00A11C2F-969F-4964-8557-91ADF4B1523D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{00A11C2F-969F-4964-8557-91ADF4B1523D}.Release|Any CPU.Build.0 = Release|Any CPU
{EB956381-F3E6-437C-9069-36B8BF5C6E2F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{EB956381-F3E6-437C-9069-36B8BF5C6E2F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EB956381-F3E6-437C-9069-36B8BF5C6E2F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{EB956381-F3E6-437C-9069-36B8BF5C6E2F}.Release|Any CPU.Build.0 = Release|Any CPU
[Handlers] Register handlers and use Microsoft.Extensions for Hosting and Dependency Injection (#12460) * [Core,Android,iOS] Add AppBuilder and AppHost and sample and tests * [eng] Add script to measure android startup * Update src/Platform.Handlers/tests/Xamarin.Platform.Handlers.Benchmarks/HandlersBenchmarker.cs Co-authored-by: Pedro Jesus <pedrojesus.cefet@gmail.com> * [Sample ] Update sample code * [Tests] Fix hosting tests * Small cleanup * [handlers] Add Window and cleanup hosting * [Controls] Remove xf button * [Hosting] Remove AppLifetiem for now * Fix sample code * [Build] Fix rebase * [Test] Fix test * [Build] Remove reference to http package * [Handlers] Rework Hosting, add option to override ServiceCollection and ServiceProvider, remove usage of Extensions DI * [Hosting] Refactor to use extensions and rename some Stubs * [Hosting] Small refactor * [Hosting] Fix null reference usage on .net6 * [Samples] Install DI extension package on net6 samples * [Sample] Add Maui.Controls.Sample * Fix props * [Sample] Fix sample move to Shared folder * Revert "[Sample] Fix sample move to Shared folder" This reverts commit 88980f527be91c028db6b1667a3cf39401ac5757. * Revert "Fix props" This reverts commit 3f8467d8251d8b3b7aee8fe3b5e01bbf0711ea6a. * Revert "[Sample] Add Maui.Controls.Sample" This reverts commit 3d0ad41544fc8e0ee60d352a028f69bce96e6d8f. * [Hosting] Add Configuration support * [Hosting]Add Maui.Controls sample * [Hosting]Fix sln * [Hosting] Add net6 Maui.Controls.Sample * Cleanup * More cleanup * Implement iAPP on old sample * [Hosting] Fix build * [Hosting] Just use forms on sample , add GetWindow to IApp * [Hosting] Add HandlersContext to App * [Hosting] Add MauiAppCompatActivity * [Hosting] Move HandlersContext to Window * Remove extra files * [Hosting] Add MauiApp * Fix build * Update Maui.Controls.Sample.iOS-net6.csproj * Update AssemblyInfo.cs * Update Maui.Controls.Sample-net6.csproj * [Hosting] Be able to run old and new registrar * Add Android resources * [Android] Add xml resources * Fix * Fix unit tests * [Application] Fix net6 nre * Cleanuo * Fix build again * [Samples] Add essentials init * Fix net6 build * - update packagese * - add handler renderer shim * - fix link references * Fix running app on Android * - fix missing using * - shim sample * - add another helper * [Hosting] Save context on App for now * [Handlers] Fix sample register ISwitch * [Hosting] Some renaming * - delete samples * - fix CG * [Hosting] Remove old registrar code * Remove FormsHandlers * TODO: Implement legacy attribute scanner with AppHostBuilder * Fix build * Enable nullable * fix formatting * Fix using old registrar * use c# 9 * Try fix #nullable * Don't disable nullable warnings Use the null-forgiving operator (!) to rather swear that we doin' good * Fixed the benchmarks and tests with new code Also split the benchmarks into separate classes for better comparison. * Fixing some merge issues * Remove usage of FormsHandlers * [Hosting] Small refactor , fixing same names * remove this * [Hosting] Fix MauiHandlersServiceProvider Co-authored-by: Pedro Jesus <pedrojesus.cefet@gmail.com> Co-authored-by: Shane Neuville <shneuvil@microsoft.com> Co-authored-by: Matthew Leibowitz <mattleibow@live.com>
2021-02-23 23:05:46 +03:00
{B8DC1324-977C-46F1-B697-9064ADE6099A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B8DC1324-977C-46F1-B697-9064ADE6099A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B8DC1324-977C-46F1-B697-9064ADE6099A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B8DC1324-977C-46F1-B697-9064ADE6099A}.Release|Any CPU.Build.0 = Release|Any CPU
{BE50FAEF-4096-48B5-B9CE-EE0C38F15A18}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BE50FAEF-4096-48B5-B9CE-EE0C38F15A18}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BE50FAEF-4096-48B5-B9CE-EE0C38F15A18}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
{BE50FAEF-4096-48B5-B9CE-EE0C38F15A18}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BE50FAEF-4096-48B5-B9CE-EE0C38F15A18}.Release|Any CPU.Build.0 = Release|Any CPU
{1C3439E6-73D7-4F8E-A64A-5448F5CB18DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1C3439E6-73D7-4F8E-A64A-5448F5CB18DE}.Debug|Any CPU.Build.0 = Debug|Any CPU
[build] bootstrap a local .\bin\dotnet\ with .NET Workloads (#514) Based on: https://github.com/jonathanpeppers/maui-workload This adds a new `DotNet.csproj` that provisions a local .NET 6 install into `.\bin\dotnet\`. Next, it uses versions defined in `eng/Versions.props` as required by .NET version bumping infrastructure (called Darc): <Project> <PropertyGroup> <MicrosoftNETSdkPackageVersion>6.0.100-preview.2.21155.3</MicrosoftNETSdkPackageVersion> <MicrosoftAndroidSdkPackageVersion>11.0.200-ci.main.148</MicrosoftAndroidSdkPackageVersion> <MicrosoftMacCatalystSdkPackageVersion>14.3.100-ci.main.337</MicrosoftMacCatalystSdkPackageVersion> <MicrosoftiOSSdkPackageVersion>14.4.100-ci.main.1192</MicrosoftiOSSdkPackageVersion> </PropertyGroup> </Project> Next, we can use these versions to consume NuGet packages for workloads: <PackageDownload Include="Microsoft.NET.Workload.Android" Version="[$(MicrosoftAndroidSdkPackageVersion)]" /> <PackageDownload Include="Microsoft.NET.Workload.MacCatalyst" Version="[$(MicrosoftMacCatalystSdkPackageVersion)]" /> <PackageDownload Include="Microsoft.NET.Workload.iOS" Version="[$(MicrosoftiOSSdkPackageVersion)]" /> Then the other packs they depend on: <PackageDownload Include="Microsoft.Android.Ref" Version="[$(MicrosoftAndroidSdkPackageVersion)]" /> <PackageDownload Include="Microsoft.Android.Sdk.win-x64" Version="[$(MicrosoftAndroidSdkPackageVersion)]" Condition="$([MSBuild]::IsOSPlatform('windows'))" /> <PackageDownload Include="Microsoft.Android.Sdk.osx-x64" Version="[$(MicrosoftAndroidSdkPackageVersion)]" Condition="$([MSBuild]::IsOSPlatform('osx'))" /> <PackageDownload Include="Microsoft.Android.Sdk.BundleTool" Version="[$(MicrosoftAndroidSdkPackageVersion)]" /> <PackageDownload Include="Microsoft.MacCatalyst.Ref" Version="[$(MicrosoftMacCatalystSdkPackageVersion)]" /> <PackageDownload Include="Microsoft.MacCatalyst.Sdk" Version="[$(MicrosoftMacCatalystSdkPackageVersion)]" /> <PackageDownload Include="Microsoft.iOS.Ref" Version="[$(MicrosoftiOSSdkPackageVersion)]" /> <PackageDownload Include="Microsoft.iOS.Sdk" Version="[$(MicrosoftiOSSdkPackageVersion)]" /> After doing this, I can build .NET 6 projects with: > .\bin\dotnet\dotnet.exe build .\src\Controls\samples\Controls.Sample.SingleProject\Maui.Controls.Sample.SingleProject.csproj I can even build MacCatalyst apps on Windows! I updated `build.cake` so the following builds for .NET 6 and opens Visual Studio: > dotnet cake --target=VS-NET6 This is the equivalent of these commands if you want to run them individually: dotnet build src\DotNet\DotNet.csproj .\bin\dotnet\dotnet build Microsoft.Maui.BuildTasks-net6.sln .\bin\dotnet\dotnet build Microsoft.Maui-net6.sln .\eng\dogfood.ps1 ~~ Other Changes ~~ * Rework CI setup to use .\bin\dotnet\dotnet * We don't need boots or URLs anymore * Fixed `MSBuildTests` to use .\bin\dotnet\dotnet if found and fall back to the system `dotnet` * Moved `.nuspec\package.ps1` to `eng\package.ps1` ~~ What problems does this solve? ~~ * MacCatalyst builds on Windows! (offline build that checks C#) * Building Maui always gets you the right things installed. * Maui becoming a .NET workload will be a breeze. We can copy files into `.\bin\dotnet\sdk-manifests` and `.\bin\dotnet\packs`. * We can use Darc to bump dependencies within .NET: https://github.com/dotnet/arcade/blob/main/Documentation/Darc.md
2021-03-22 13:16:06 +03:00
{1C3439E6-73D7-4F8E-A64A-5448F5CB18DE}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
[Handlers] Register handlers and use Microsoft.Extensions for Hosting and Dependency Injection (#12460) * [Core,Android,iOS] Add AppBuilder and AppHost and sample and tests * [eng] Add script to measure android startup * Update src/Platform.Handlers/tests/Xamarin.Platform.Handlers.Benchmarks/HandlersBenchmarker.cs Co-authored-by: Pedro Jesus <pedrojesus.cefet@gmail.com> * [Sample ] Update sample code * [Tests] Fix hosting tests * Small cleanup * [handlers] Add Window and cleanup hosting * [Controls] Remove xf button * [Hosting] Remove AppLifetiem for now * Fix sample code * [Build] Fix rebase * [Test] Fix test * [Build] Remove reference to http package * [Handlers] Rework Hosting, add option to override ServiceCollection and ServiceProvider, remove usage of Extensions DI * [Hosting] Refactor to use extensions and rename some Stubs * [Hosting] Small refactor * [Hosting] Fix null reference usage on .net6 * [Samples] Install DI extension package on net6 samples * [Sample] Add Maui.Controls.Sample * Fix props * [Sample] Fix sample move to Shared folder * Revert "[Sample] Fix sample move to Shared folder" This reverts commit 88980f527be91c028db6b1667a3cf39401ac5757. * Revert "Fix props" This reverts commit 3f8467d8251d8b3b7aee8fe3b5e01bbf0711ea6a. * Revert "[Sample] Add Maui.Controls.Sample" This reverts commit 3d0ad41544fc8e0ee60d352a028f69bce96e6d8f. * [Hosting] Add Configuration support * [Hosting]Add Maui.Controls sample * [Hosting]Fix sln * [Hosting] Add net6 Maui.Controls.Sample * Cleanup * More cleanup * Implement iAPP on old sample * [Hosting] Fix build * [Hosting] Just use forms on sample , add GetWindow to IApp * [Hosting] Add HandlersContext to App * [Hosting] Add MauiAppCompatActivity * [Hosting] Move HandlersContext to Window * Remove extra files * [Hosting] Add MauiApp * Fix build * Update Maui.Controls.Sample.iOS-net6.csproj * Update AssemblyInfo.cs * Update Maui.Controls.Sample-net6.csproj * [Hosting] Be able to run old and new registrar * Add Android resources * [Android] Add xml resources * Fix * Fix unit tests * [Application] Fix net6 nre * Cleanuo * Fix build again * [Samples] Add essentials init * Fix net6 build * - update packagese * - add handler renderer shim * - fix link references * Fix running app on Android * - fix missing using * - shim sample * - add another helper * [Hosting] Save context on App for now * [Handlers] Fix sample register ISwitch * [Hosting] Some renaming * - delete samples * - fix CG * [Hosting] Remove old registrar code * Remove FormsHandlers * TODO: Implement legacy attribute scanner with AppHostBuilder * Fix build * Enable nullable * fix formatting * Fix using old registrar * use c# 9 * Try fix #nullable * Don't disable nullable warnings Use the null-forgiving operator (!) to rather swear that we doin' good * Fixed the benchmarks and tests with new code Also split the benchmarks into separate classes for better comparison. * Fixing some merge issues * Remove usage of FormsHandlers * [Hosting] Small refactor , fixing same names * remove this * [Hosting] Fix MauiHandlersServiceProvider Co-authored-by: Pedro Jesus <pedrojesus.cefet@gmail.com> Co-authored-by: Shane Neuville <shneuvil@microsoft.com> Co-authored-by: Matthew Leibowitz <mattleibow@live.com>
2021-02-23 23:05:46 +03:00
{1C3439E6-73D7-4F8E-A64A-5448F5CB18DE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1C3439E6-73D7-4F8E-A64A-5448F5CB18DE}.Release|Any CPU.Build.0 = Release|Any CPU
Improves Samples (#447)
2021-03-09 05:44:52 +03:00
{D7FE9FD0-144A-4199-93FC-3AD62325F1D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D7FE9FD0-144A-4199-93FC-3AD62325F1D6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D7FE9FD0-144A-4199-93FC-3AD62325F1D6}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D7FE9FD0-144A-4199-93FC-3AD62325F1D6}.Release|Any CPU.Build.0 = Release|Any CPU
.NET Maui "Single Project" (#13858) Context: https://github.com/xamarin/xamarin-android/blob/fcd9c30164d4ac0e88440357b5c96b9fdebccb39/Documentation/guides/OneDotNetSingleProject.md We are aiming to get a new project type working that would have a `.csproj` such as: <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> <TargetFramework>net6.0-android;net6.0-ios</TargetFramework> <OutputType>Exe</OutputType> <SingleProject>true</SingleProject> </PropertyGroup> </Project> Within the project you would have: * `*.cs` all shared code * `iOS/*` - iOS only stuff, including `Info.plist` * `Android/*` - Android only stuff, including `AndroidManifest.xml` I also used some other new settings that results in a smaller `Info.plist` and `AndroidManifest.xml`: <ApplicationTitle>Single Project</ApplicationTitle> <ApplicationId>com.microsoft.maui.singleproject</ApplicationId> <ApplicationVersion>1.0</ApplicationVersion> <AndroidVersionCode>1</AndroidVersionCode> The eventual goal being we might be able to completely get rid of `Info.plist` and `AndroidManifest.xml` for simple apps. You would only need them for edge-case, platform-specific features. To get this working within a NuGet package, we can include two new files: * `Xamarin.Forms.SingleProject.props` * `Xamarin.Forms.SingleProject.targets` They only enable things conditionally, if `$(SingleProject)` is set. I created a new sample with a single `Label` to demonstrate things working.
2021-02-26 18:07:26 +03:00
{CB495F62-CFE6-4975-AED8-F26B6C5D0113}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{CB495F62-CFE6-4975-AED8-F26B6C5D0113}.Debug|Any CPU.Build.0 = Debug|Any CPU
[build] bootstrap a local .\bin\dotnet\ with .NET Workloads (#514) Based on: https://github.com/jonathanpeppers/maui-workload This adds a new `DotNet.csproj` that provisions a local .NET 6 install into `.\bin\dotnet\`. Next, it uses versions defined in `eng/Versions.props` as required by .NET version bumping infrastructure (called Darc): <Project> <PropertyGroup> <MicrosoftNETSdkPackageVersion>6.0.100-preview.2.21155.3</MicrosoftNETSdkPackageVersion> <MicrosoftAndroidSdkPackageVersion>11.0.200-ci.main.148</MicrosoftAndroidSdkPackageVersion> <MicrosoftMacCatalystSdkPackageVersion>14.3.100-ci.main.337</MicrosoftMacCatalystSdkPackageVersion> <MicrosoftiOSSdkPackageVersion>14.4.100-ci.main.1192</MicrosoftiOSSdkPackageVersion> </PropertyGroup> </Project> Next, we can use these versions to consume NuGet packages for workloads: <PackageDownload Include="Microsoft.NET.Workload.Android" Version="[$(MicrosoftAndroidSdkPackageVersion)]" /> <PackageDownload Include="Microsoft.NET.Workload.MacCatalyst" Version="[$(MicrosoftMacCatalystSdkPackageVersion)]" /> <PackageDownload Include="Microsoft.NET.Workload.iOS" Version="[$(MicrosoftiOSSdkPackageVersion)]" /> Then the other packs they depend on: <PackageDownload Include="Microsoft.Android.Ref" Version="[$(MicrosoftAndroidSdkPackageVersion)]" /> <PackageDownload Include="Microsoft.Android.Sdk.win-x64" Version="[$(MicrosoftAndroidSdkPackageVersion)]" Condition="$([MSBuild]::IsOSPlatform('windows'))" /> <PackageDownload Include="Microsoft.Android.Sdk.osx-x64" Version="[$(MicrosoftAndroidSdkPackageVersion)]" Condition="$([MSBuild]::IsOSPlatform('osx'))" /> <PackageDownload Include="Microsoft.Android.Sdk.BundleTool" Version="[$(MicrosoftAndroidSdkPackageVersion)]" /> <PackageDownload Include="Microsoft.MacCatalyst.Ref" Version="[$(MicrosoftMacCatalystSdkPackageVersion)]" /> <PackageDownload Include="Microsoft.MacCatalyst.Sdk" Version="[$(MicrosoftMacCatalystSdkPackageVersion)]" /> <PackageDownload Include="Microsoft.iOS.Ref" Version="[$(MicrosoftiOSSdkPackageVersion)]" /> <PackageDownload Include="Microsoft.iOS.Sdk" Version="[$(MicrosoftiOSSdkPackageVersion)]" /> After doing this, I can build .NET 6 projects with: > .\bin\dotnet\dotnet.exe build .\src\Controls\samples\Controls.Sample.SingleProject\Maui.Controls.Sample.SingleProject.csproj I can even build MacCatalyst apps on Windows! I updated `build.cake` so the following builds for .NET 6 and opens Visual Studio: > dotnet cake --target=VS-NET6 This is the equivalent of these commands if you want to run them individually: dotnet build src\DotNet\DotNet.csproj .\bin\dotnet\dotnet build Microsoft.Maui.BuildTasks-net6.sln .\bin\dotnet\dotnet build Microsoft.Maui-net6.sln .\eng\dogfood.ps1 ~~ Other Changes ~~ * Rework CI setup to use .\bin\dotnet\dotnet * We don't need boots or URLs anymore * Fixed `MSBuildTests` to use .\bin\dotnet\dotnet if found and fall back to the system `dotnet` * Moved `.nuspec\package.ps1` to `eng\package.ps1` ~~ What problems does this solve? ~~ * MacCatalyst builds on Windows! (offline build that checks C#) * Building Maui always gets you the right things installed. * Maui becoming a .NET workload will be a breeze. We can copy files into `.\bin\dotnet\sdk-manifests` and `.\bin\dotnet\packs`. * We can use Darc to bump dependencies within .NET: https://github.com/dotnet/arcade/blob/main/Documentation/Darc.md
2021-03-22 13:16:06 +03:00
{CB495F62-CFE6-4975-AED8-F26B6C5D0113}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
.NET Maui "Single Project" (#13858) Context: https://github.com/xamarin/xamarin-android/blob/fcd9c30164d4ac0e88440357b5c96b9fdebccb39/Documentation/guides/OneDotNetSingleProject.md We are aiming to get a new project type working that would have a `.csproj` such as: <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> <TargetFramework>net6.0-android;net6.0-ios</TargetFramework> <OutputType>Exe</OutputType> <SingleProject>true</SingleProject> </PropertyGroup> </Project> Within the project you would have: * `*.cs` all shared code * `iOS/*` - iOS only stuff, including `Info.plist` * `Android/*` - Android only stuff, including `AndroidManifest.xml` I also used some other new settings that results in a smaller `Info.plist` and `AndroidManifest.xml`: <ApplicationTitle>Single Project</ApplicationTitle> <ApplicationId>com.microsoft.maui.singleproject</ApplicationId> <ApplicationVersion>1.0</ApplicationVersion> <AndroidVersionCode>1</AndroidVersionCode> The eventual goal being we might be able to completely get rid of `Info.plist` and `AndroidManifest.xml` for simple apps. You would only need them for edge-case, platform-specific features. To get this working within a NuGet package, we can include two new files: * `Xamarin.Forms.SingleProject.props` * `Xamarin.Forms.SingleProject.targets` They only enable things conditionally, if `$(SingleProject)` is set. I created a new sample with a single `Label` to demonstrate things working.
2021-02-26 18:07:26 +03:00
{CB495F62-CFE6-4975-AED8-F26B6C5D0113}.Release|Any CPU.ActiveCfg = Release|Any CPU
{CB495F62-CFE6-4975-AED8-F26B6C5D0113}.Release|Any CPU.Build.0 = Release|Any CPU
Make .NET 6 Packable (#13881) * Add some common nupkg properties to everything * Remove project property refactored into directory build props * Remove properties now in common dir build props * Add net6 version of project * More net6 * Only target netstandard2.0 now net4* is no longer needed as there's no more vs2017 support * Clean up strong naming a bit * Update dependencies * Package all the things for build tasks in the -t:Pack * Add more net6 project versions * Clean up whitespace * Needed moar NET6 * Name fixes * Added meta project for packaging and package script * Remove assembly copyright (now duplicates) * Add resizetizer, add params to package script * Disable strong naming for now We need to re-evaluate how we do this a bit, we should probably use the `al` tool to do it now, and I believe the StrongNamer package may not work anymore, but we can do the same thing in a custom target at a later date. * Fix path to tasks assembly * don't build ios on android specific project * Finish rename of toolbox file * - add cake * - fix cake extras * fix the copy for the IDE * Try packing on CI * versions baby! * build release * this should od it * this * oops * Move to an empty folder * Use new symbol formats * no symbols for build tasks and the head * symbol all the things * Compiler error with commented out code XD * oopsies * only build transitive * Try this * log everything * This might work * REPORTS * previews * needed * versions * duh * Update build.cake Co-authored-by: Shane Neuville <shneuvil@microsoft.com> Co-authored-by: Matthew Leibowitz <mattleibow@live.com>
2021-03-02 20:36:17 +03:00
{75C380E0-CE53-4C01-B89F-CF685331DE18}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{75C380E0-CE53-4C01-B89F-CF685331DE18}.Debug|Any CPU.Build.0 = Debug|Any CPU
{75C380E0-CE53-4C01-B89F-CF685331DE18}.Release|Any CPU.ActiveCfg = Release|Any CPU
{75C380E0-CE53-4C01-B89F-CF685331DE18}.Release|Any CPU.Build.0 = Release|Any CPU
Pack Essentials net6 (#13925) * Build and pack essentials for net6 * Fix net6 pack for essentials * Fix a property * Pack net6 version of essentials
2021-03-03 19:12:28 +03:00
{39B47A3C-21CA-4B28-9250-14FD957EB0FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{39B47A3C-21CA-4B28-9250-14FD957EB0FC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{39B47A3C-21CA-4B28-9250-14FD957EB0FC}.Release|Any CPU.ActiveCfg = Release|Any CPU
{39B47A3C-21CA-4B28-9250-14FD957EB0FC}.Release|Any CPU.Build.0 = Release|Any CPU
Enable unit tests (#13864) * [Build] Remove old steps * Fix reference of unit tests cspro * Enable xaml unit tests * [Build] Add build of xaml unit tests * Try fix targets * Fix Forms naming * More naming fixes * Revert versions * Remove .Core * More .Core removals and Fix Platform references * Add RootNamespace to Build.Tasks * Fix more Xamarin.Forms old usage * Fix dll on build.targets * Fix _XFBuildTasksLocation * More fixes to _MauiBuildTasksLocation * More fixes _MauiBuildTasksLocation * Fix _MauiBuildTasksLocation * remove debug info * Remove issues for now * Rename maps namespace * Fix Assembly tests * Fix more targets * More map rename fixes * Fix xaml reference on unit tests * Fix MauiXamlCValidateOnly naming * More MauiXamlCValidateOnly * Add xaml page to sample * Fix namespace on sample page * oh, yeah * Fix sample references * Try run on release the xaml unit tests * Try continueOnerror * Update build-windows.yml * added via the directory props * ws * We mights need this * I think I did this * This can be reused * 🤦‍♀️ * this as well after the peppers PR * Fix some bad renames * i see * Fix merge * Fix sample * Remove FromSource * Add the packages * this * Yaysies! * Fix all the non-msbuild tests * Adding things back and gallery * this * Build the tasks first * Got the Android control gallery running * remove from the sln * Xaml pages * Reference XAML * this * better XAML * this * restore * maybe * include correctly * symbols * Try set the versions * remove unused steps templates versions things more cool yay * Updating code to pre-fix xaml * Now we do the targets * Revert "Now we do the targets" This reverts commit 2ce4984d48a00c1eab8037cdd8a35690feb0038e. * maybe this? * We have to set the variables * Add the control gallery and xaml unit tests * This might help * xaml page * Try use matrix for build/release macOS * Fix variables * Fix end of script * use matrix for build on windows * Fix Artifact upload at same time Co-authored-by: Stephane Delcroix <stephane@delcroix.org> Co-authored-by: Matthew Leibowitz <mattleibow@live.com>
2021-03-03 18:20:03 +03:00
{9909F93F-C085-4F76-B92A-5D8C516BF47D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9909F93F-C085-4F76-B92A-5D8C516BF47D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9909F93F-C085-4F76-B92A-5D8C516BF47D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9909F93F-C085-4F76-B92A-5D8C516BF47D}.Release|Any CPU.Build.0 = Release|Any CPU
{5BEB3326-79B4-438C-BF65-274202F387EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5BEB3326-79B4-438C-BF65-274202F387EC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5BEB3326-79B4-438C-BF65-274202F387EC}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5BEB3326-79B4-438C-BF65-274202F387EC}.Release|Any CPU.Build.0 = Release|Any CPU
{CC3D4667-D94E-4276-9311-6439BFD075E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{CC3D4667-D94E-4276-9311-6439BFD075E4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CC3D4667-D94E-4276-9311-6439BFD075E4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{CC3D4667-D94E-4276-9311-6439BFD075E4}.Release|Any CPU.Build.0 = Release|Any CPU
.NET 6 maui-mobile template (#371)
2021-03-05 06:41:53 +03:00
{DAAC2822-63B6-4DE0-83AE-04873CD2F364}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{DAAC2822-63B6-4DE0-83AE-04873CD2F364}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DAAC2822-63B6-4DE0-83AE-04873CD2F364}.Release|Any CPU.ActiveCfg = Release|Any CPU
{DAAC2822-63B6-4DE0-83AE-04873CD2F364}.Release|Any CPU.Build.0 = Release|Any CPU
Move the templates into a separate folder (#614) - Move templates to /src/Templates - Add Core.UnitTests to net6 solution
2021-03-30 11:29:52 +03:00
{FBB3270F-1924-4A72-845E-A6DF39C402F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FBB3270F-1924-4A72-845E-A6DF39C402F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FBB3270F-1924-4A72-845E-A6DF39C402F6}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FBB3270F-1924-4A72-845E-A6DF39C402F6}.Release|Any CPU.Build.0 = Release|Any CPU
{92644F6F-5946-48FC-A21A-A3D6EE24E8B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{92644F6F-5946-48FC-A21A-A3D6EE24E8B3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{92644F6F-5946-48FC-A21A-A3D6EE24E8B3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{92644F6F-5946-48FC-A21A-A3D6EE24E8B3}.Release|Any CPU.Build.0 = Release|Any CPU
Setup Maui.sln with a set of net6 projects (#13433) * net6 projects * - additional * - net6 nullable fixes * - provision sdks * - net6.0 * - change to 5.0.0 * - update cake provisioning * - net6 fixes * - fix up platform heads * - fix global.json * - add net6 nuget feeds * - fix up platform heads and net6 if defs * - simplify * - add dotnet core build of maui sln * - update readme * - net6 yaml target * - remove net6 build from nuget * - simplify provisioning * - write json file * - net6 via yaml * - fix parameters * - more boots * - yaml * - base yaml pipeline off net6-samples * - yaml yaml yaml * - mac yaml * - add binlogs * - set AndroidRestoreOnBuild to false * - browser assembly * - fix artifacts directories * - fix NET6 artifacts * - update to preview bits * Update handlers.yml * [Build]Deploy android sample app * - restore from devops config Co-authored-by: Rui Marinho <me@ruimarinho.net>
2021-02-11 01:24:09 +03:00
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
[Handlers] Register handlers and use Microsoft.Extensions for Hosting and Dependency Injection (#12460) * [Core,Android,iOS] Add AppBuilder and AppHost and sample and tests * [eng] Add script to measure android startup * Update src/Platform.Handlers/tests/Xamarin.Platform.Handlers.Benchmarks/HandlersBenchmarker.cs Co-authored-by: Pedro Jesus <pedrojesus.cefet@gmail.com> * [Sample ] Update sample code * [Tests] Fix hosting tests * Small cleanup * [handlers] Add Window and cleanup hosting * [Controls] Remove xf button * [Hosting] Remove AppLifetiem for now * Fix sample code * [Build] Fix rebase * [Test] Fix test * [Build] Remove reference to http package * [Handlers] Rework Hosting, add option to override ServiceCollection and ServiceProvider, remove usage of Extensions DI * [Hosting] Refactor to use extensions and rename some Stubs * [Hosting] Small refactor * [Hosting] Fix null reference usage on .net6 * [Samples] Install DI extension package on net6 samples * [Sample] Add Maui.Controls.Sample * Fix props * [Sample] Fix sample move to Shared folder * Revert "[Sample] Fix sample move to Shared folder" This reverts commit 88980f527be91c028db6b1667a3cf39401ac5757. * Revert "Fix props" This reverts commit 3f8467d8251d8b3b7aee8fe3b5e01bbf0711ea6a. * Revert "[Sample] Add Maui.Controls.Sample" This reverts commit 3d0ad41544fc8e0ee60d352a028f69bce96e6d8f. * [Hosting] Add Configuration support * [Hosting]Add Maui.Controls sample * [Hosting]Fix sln * [Hosting] Add net6 Maui.Controls.Sample * Cleanup * More cleanup * Implement iAPP on old sample * [Hosting] Fix build * [Hosting] Just use forms on sample , add GetWindow to IApp * [Hosting] Add HandlersContext to App * [Hosting] Add MauiAppCompatActivity * [Hosting] Move HandlersContext to Window * Remove extra files * [Hosting] Add MauiApp * Fix build * Update Maui.Controls.Sample.iOS-net6.csproj * Update AssemblyInfo.cs * Update Maui.Controls.Sample-net6.csproj * [Hosting] Be able to run old and new registrar * Add Android resources * [Android] Add xml resources * Fix * Fix unit tests * [Application] Fix net6 nre * Cleanuo * Fix build again * [Samples] Add essentials init * Fix net6 build * - update packagese * - add handler renderer shim * - fix link references * Fix running app on Android * - fix missing using * - shim sample * - add another helper * [Hosting] Save context on App for now * [Handlers] Fix sample register ISwitch * [Hosting] Some renaming * - delete samples * - fix CG * [Hosting] Remove old registrar code * Remove FormsHandlers * TODO: Implement legacy attribute scanner with AppHostBuilder * Fix build * Enable nullable * fix formatting * Fix using old registrar * use c# 9 * Try fix #nullable * Don't disable nullable warnings Use the null-forgiving operator (!) to rather swear that we doin' good * Fixed the benchmarks and tests with new code Also split the benchmarks into separate classes for better comparison. * Fixing some merge issues * Remove usage of FormsHandlers * [Hosting] Small refactor , fixing same names * remove this * [Hosting] Fix MauiHandlersServiceProvider Co-authored-by: Pedro Jesus <pedrojesus.cefet@gmail.com> Co-authored-by: Shane Neuville <shneuvil@microsoft.com> Co-authored-by: Matthew Leibowitz <mattleibow@live.com>
2021-02-23 23:05:46 +03:00
GlobalSection(NestedProjects) = preSolution
Make the various usage of ConfigureServices more consistent (#615) * Implement native lifecycle events for Android and iOS * Fix build error * Update things to new things * Fix build errors * Renamed Platform lifetime interfaces and mapped more methods * Bad merge * Trying a new idea * Using IActivityLifecycleCallbacks * Clean up a bit * Add iOS lifecycle delegates * Do a heck lot of things * The GPS _is_ working! * Fix da build! * Fix things * Move a few things - fonts into the new builder system - handlers now are configure/add - compat renderers are added like normal handlers - add a fe UseXxx extensions for "features" * update essentials * remove the shortcuts * Something is fishy * Adding a good few more tests * Fix templates * Use a better name * Move that out and public * That * Remove lifecycle for now * remove resizetizer samples * ; * More improvements * Fix things after review * Add a few overloads * switchy switch * Review things Co-authored-by: Javier Suárez Ruiz <javiersuarezruiz@hotmail.com>
2021-04-05 20:49:46 +03:00
{95BA42B5-B00E-4986-B9B5-517140378452} = {E8AD265B-3C67-4640-AC58-A522F9FB3361}
{AF64451F-E2BD-41C2-B083-F60C26AE2A9F} = {50C758FE-4E10-409A-94F5-A75480960864}
Make .NET 6 Packable (#13881) * Add some common nupkg properties to everything * Remove project property refactored into directory build props * Remove properties now in common dir build props * Add net6 version of project * More net6 * Only target netstandard2.0 now net4* is no longer needed as there's no more vs2017 support * Clean up strong naming a bit * Update dependencies * Package all the things for build tasks in the -t:Pack * Add more net6 project versions * Clean up whitespace * Needed moar NET6 * Name fixes * Added meta project for packaging and package script * Remove assembly copyright (now duplicates) * Add resizetizer, add params to package script * Disable strong naming for now We need to re-evaluate how we do this a bit, we should probably use the `al` tool to do it now, and I believe the StrongNamer package may not work anymore, but we can do the same thing in a custom target at a later date. * Fix path to tasks assembly * don't build ios on android specific project * Finish rename of toolbox file * - add cake * - fix cake extras * fix the copy for the IDE * Try packing on CI * versions baby! * build release * this should od it * this * oops * Move to an empty folder * Use new symbol formats * no symbols for build tasks and the head * symbol all the things * Compiler error with commented out code XD * oopsies * only build transitive * Try this * log everything * This might work * REPORTS * previews * needed * versions * duh * Update build.cake Co-authored-by: Shane Neuville <shneuvil@microsoft.com> Co-authored-by: Matthew Leibowitz <mattleibow@live.com>
2021-03-02 20:36:17 +03:00
{00A11C2F-969F-4964-8557-91ADF4B1523D} = {123AA89E-1638-4E0E-B828-B8F9F9F906A2}
{EB956381-F3E6-437C-9069-36B8BF5C6E2F} = {123AA89E-1638-4E0E-B828-B8F9F9F906A2}
[Handlers] Register handlers and use Microsoft.Extensions for Hosting and Dependency Injection (#12460) * [Core,Android,iOS] Add AppBuilder and AppHost and sample and tests * [eng] Add script to measure android startup * Update src/Platform.Handlers/tests/Xamarin.Platform.Handlers.Benchmarks/HandlersBenchmarker.cs Co-authored-by: Pedro Jesus <pedrojesus.cefet@gmail.com> * [Sample ] Update sample code * [Tests] Fix hosting tests * Small cleanup * [handlers] Add Window and cleanup hosting * [Controls] Remove xf button * [Hosting] Remove AppLifetiem for now * Fix sample code * [Build] Fix rebase * [Test] Fix test * [Build] Remove reference to http package * [Handlers] Rework Hosting, add option to override ServiceCollection and ServiceProvider, remove usage of Extensions DI * [Hosting] Refactor to use extensions and rename some Stubs * [Hosting] Small refactor * [Hosting] Fix null reference usage on .net6 * [Samples] Install DI extension package on net6 samples * [Sample] Add Maui.Controls.Sample * Fix props * [Sample] Fix sample move to Shared folder * Revert "[Sample] Fix sample move to Shared folder" This reverts commit 88980f527be91c028db6b1667a3cf39401ac5757. * Revert "Fix props" This reverts commit 3f8467d8251d8b3b7aee8fe3b5e01bbf0711ea6a. * Revert "[Sample] Add Maui.Controls.Sample" This reverts commit 3d0ad41544fc8e0ee60d352a028f69bce96e6d8f. * [Hosting] Add Configuration support * [Hosting]Add Maui.Controls sample * [Hosting]Fix sln * [Hosting] Add net6 Maui.Controls.Sample * Cleanup * More cleanup * Implement iAPP on old sample * [Hosting] Fix build * [Hosting] Just use forms on sample , add GetWindow to IApp * [Hosting] Add HandlersContext to App * [Hosting] Add MauiAppCompatActivity * [Hosting] Move HandlersContext to Window * Remove extra files * [Hosting] Add MauiApp * Fix build * Update Maui.Controls.Sample.iOS-net6.csproj * Update AssemblyInfo.cs * Update Maui.Controls.Sample-net6.csproj * [Hosting] Be able to run old and new registrar * Add Android resources * [Android] Add xml resources * Fix * Fix unit tests * [Application] Fix net6 nre * Cleanuo * Fix build again * [Samples] Add essentials init * Fix net6 build * - update packagese * - add handler renderer shim * - fix link references * Fix running app on Android * - fix missing using * - shim sample * - add another helper * [Hosting] Save context on App for now * [Handlers] Fix sample register ISwitch * [Hosting] Some renaming * - delete samples * - fix CG * [Hosting] Remove old registrar code * Remove FormsHandlers * TODO: Implement legacy attribute scanner with AppHostBuilder * Fix build * Enable nullable * fix formatting * Fix using old registrar * use c# 9 * Try fix #nullable * Don't disable nullable warnings Use the null-forgiving operator (!) to rather swear that we doin' good * Fixed the benchmarks and tests with new code Also split the benchmarks into separate classes for better comparison. * Fixing some merge issues * Remove usage of FormsHandlers * [Hosting] Small refactor , fixing same names * remove this * [Hosting] Fix MauiHandlersServiceProvider Co-authored-by: Pedro Jesus <pedrojesus.cefet@gmail.com> Co-authored-by: Shane Neuville <shneuvil@microsoft.com> Co-authored-by: Matthew Leibowitz <mattleibow@live.com>
2021-02-23 23:05:46 +03:00
{E1082E26-D700-4127-9329-66D673FD2D55} = {459BF674-83CB-46F6-881F-A2D2117DBF4D}
{B8DC1324-977C-46F1-B697-9064ADE6099A} = {E1082E26-D700-4127-9329-66D673FD2D55}
{BE50FAEF-4096-48B5-B9CE-EE0C38F15A18} = {E1082E26-D700-4127-9329-66D673FD2D55}
{1C3439E6-73D7-4F8E-A64A-5448F5CB18DE} = {E1082E26-D700-4127-9329-66D673FD2D55}
Improves Samples (#447)
2021-03-09 05:44:52 +03:00
{D7FE9FD0-144A-4199-93FC-3AD62325F1D6} = {E1082E26-D700-4127-9329-66D673FD2D55}
.NET Maui "Single Project" (#13858) Context: https://github.com/xamarin/xamarin-android/blob/fcd9c30164d4ac0e88440357b5c96b9fdebccb39/Documentation/guides/OneDotNetSingleProject.md We are aiming to get a new project type working that would have a `.csproj` such as: <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> <TargetFramework>net6.0-android;net6.0-ios</TargetFramework> <OutputType>Exe</OutputType> <SingleProject>true</SingleProject> </PropertyGroup> </Project> Within the project you would have: * `*.cs` all shared code * `iOS/*` - iOS only stuff, including `Info.plist` * `Android/*` - Android only stuff, including `AndroidManifest.xml` I also used some other new settings that results in a smaller `Info.plist` and `AndroidManifest.xml`: <ApplicationTitle>Single Project</ApplicationTitle> <ApplicationId>com.microsoft.maui.singleproject</ApplicationId> <ApplicationVersion>1.0</ApplicationVersion> <AndroidVersionCode>1</AndroidVersionCode> The eventual goal being we might be able to completely get rid of `Info.plist` and `AndroidManifest.xml` for simple apps. You would only need them for edge-case, platform-specific features. To get this working within a NuGet package, we can include two new files: * `Xamarin.Forms.SingleProject.props` * `Xamarin.Forms.SingleProject.targets` They only enable things conditionally, if `$(SingleProject)` is set. I created a new sample with a single `Label` to demonstrate things working.
2021-02-26 18:07:26 +03:00
{CB495F62-CFE6-4975-AED8-F26B6C5D0113} = {E1082E26-D700-4127-9329-66D673FD2D55}
Make the various usage of ConfigureServices more consistent (#615) * Implement native lifecycle events for Android and iOS * Fix build error * Update things to new things * Fix build errors * Renamed Platform lifetime interfaces and mapped more methods * Bad merge * Trying a new idea * Using IActivityLifecycleCallbacks * Clean up a bit * Add iOS lifecycle delegates * Do a heck lot of things * The GPS _is_ working! * Fix da build! * Fix things * Move a few things - fonts into the new builder system - handlers now are configure/add - compat renderers are added like normal handlers - add a fe UseXxx extensions for "features" * update essentials * remove the shortcuts * Something is fishy * Adding a good few more tests * Fix templates * Use a better name * Move that out and public * That * Remove lifecycle for now * remove resizetizer samples * ; * More improvements * Fix things after review * Add a few overloads * switchy switch * Review things Co-authored-by: Javier Suárez Ruiz <javiersuarezruiz@hotmail.com>
2021-04-05 20:49:46 +03:00
{75C380E0-CE53-4C01-B89F-CF685331DE18} = {50C758FE-4E10-409A-94F5-A75480960864}
Pack Essentials net6 (#13925) * Build and pack essentials for net6 * Fix net6 pack for essentials * Fix a property * Pack net6 version of essentials
2021-03-03 19:12:28 +03:00
{39B47A3C-21CA-4B28-9250-14FD957EB0FC} = {94F3C036-A5F4-4ACC-A028-8506802ADB88}
Enable unit tests (#13864) * [Build] Remove old steps * Fix reference of unit tests cspro * Enable xaml unit tests * [Build] Add build of xaml unit tests * Try fix targets * Fix Forms naming * More naming fixes * Revert versions * Remove .Core * More .Core removals and Fix Platform references * Add RootNamespace to Build.Tasks * Fix more Xamarin.Forms old usage * Fix dll on build.targets * Fix _XFBuildTasksLocation * More fixes to _MauiBuildTasksLocation * More fixes _MauiBuildTasksLocation * Fix _MauiBuildTasksLocation * remove debug info * Remove issues for now * Rename maps namespace * Fix Assembly tests * Fix more targets * More map rename fixes * Fix xaml reference on unit tests * Fix MauiXamlCValidateOnly naming * More MauiXamlCValidateOnly * Add xaml page to sample * Fix namespace on sample page * oh, yeah * Fix sample references * Try run on release the xaml unit tests * Try continueOnerror * Update build-windows.yml * added via the directory props * ws * We mights need this * I think I did this * This can be reused * 🤦‍♀️ * this as well after the peppers PR * Fix some bad renames * i see * Fix merge * Fix sample * Remove FromSource * Add the packages * this * Yaysies! * Fix all the non-msbuild tests * Adding things back and gallery * this * Build the tasks first * Got the Android control gallery running * remove from the sln * Xaml pages * Reference XAML * this * better XAML * this * restore * maybe * include correctly * symbols * Try set the versions * remove unused steps templates versions things more cool yay * Updating code to pre-fix xaml * Now we do the targets * Revert "Now we do the targets" This reverts commit 2ce4984d48a00c1eab8037cdd8a35690feb0038e. * maybe this? * We have to set the variables * Add the control gallery and xaml unit tests * This might help * xaml page * Try use matrix for build/release macOS * Fix variables * Fix end of script * use matrix for build on windows * Fix Artifact upload at same time Co-authored-by: Stephane Delcroix <stephane@delcroix.org> Co-authored-by: Matthew Leibowitz <mattleibow@live.com>
2021-03-03 18:20:03 +03:00
{9909F93F-C085-4F76-B92A-5D8C516BF47D} = {D5478E0A-5D9C-4C1F-980C-7A9FC71F925E}
Move the templates into a separate folder (#614) - Move templates to /src/Templates - Add Core.UnitTests to net6 solution
2021-03-30 11:29:52 +03:00
{CC3D4667-D94E-4276-9311-6439BFD075E4} = {50C758FE-4E10-409A-94F5-A75480960864}
{DAAC2822-63B6-4DE0-83AE-04873CD2F364} = {72397ADB-40A8-4B8E-8E08-2DBE2803C845}
{FBB3270F-1924-4A72-845E-A6DF39C402F6} = {6998CAA1-11D4-46B2-B80F-0AC882F58124}
{92644F6F-5946-48FC-A21A-A3D6EE24E8B3} = {C564DDD6-DE79-45CD-88EA-3F690481572A}
{E8AD265B-3C67-4640-AC58-A522F9FB3361} = {09C264E9-E3F3-4586-9151-DCBB1F6DA7AB}
{C564DDD6-DE79-45CD-88EA-3F690481572A} = {09C264E9-E3F3-4586-9151-DCBB1F6DA7AB}
{50C758FE-4E10-409A-94F5-A75480960864} = {459BF674-83CB-46F6-881F-A2D2117DBF4D}
[Handlers] Register handlers and use Microsoft.Extensions for Hosting and Dependency Injection (#12460) * [Core,Android,iOS] Add AppBuilder and AppHost and sample and tests * [eng] Add script to measure android startup * Update src/Platform.Handlers/tests/Xamarin.Platform.Handlers.Benchmarks/HandlersBenchmarker.cs Co-authored-by: Pedro Jesus <pedrojesus.cefet@gmail.com> * [Sample ] Update sample code * [Tests] Fix hosting tests * Small cleanup * [handlers] Add Window and cleanup hosting * [Controls] Remove xf button * [Hosting] Remove AppLifetiem for now * Fix sample code * [Build] Fix rebase * [Test] Fix test * [Build] Remove reference to http package * [Handlers] Rework Hosting, add option to override ServiceCollection and ServiceProvider, remove usage of Extensions DI * [Hosting] Refactor to use extensions and rename some Stubs * [Hosting] Small refactor * [Hosting] Fix null reference usage on .net6 * [Samples] Install DI extension package on net6 samples * [Sample] Add Maui.Controls.Sample * Fix props * [Sample] Fix sample move to Shared folder * Revert "[Sample] Fix sample move to Shared folder" This reverts commit 88980f527be91c028db6b1667a3cf39401ac5757. * Revert "Fix props" This reverts commit 3f8467d8251d8b3b7aee8fe3b5e01bbf0711ea6a. * Revert "[Sample] Add Maui.Controls.Sample" This reverts commit 3d0ad41544fc8e0ee60d352a028f69bce96e6d8f. * [Hosting] Add Configuration support * [Hosting]Add Maui.Controls sample * [Hosting]Fix sln * [Hosting] Add net6 Maui.Controls.Sample * Cleanup * More cleanup * Implement iAPP on old sample * [Hosting] Fix build * [Hosting] Just use forms on sample , add GetWindow to IApp * [Hosting] Add HandlersContext to App * [Hosting] Add MauiAppCompatActivity * [Hosting] Move HandlersContext to Window * Remove extra files * [Hosting] Add MauiApp * Fix build * Update Maui.Controls.Sample.iOS-net6.csproj * Update AssemblyInfo.cs * Update Maui.Controls.Sample-net6.csproj * [Hosting] Be able to run old and new registrar * Add Android resources * [Android] Add xml resources * Fix * Fix unit tests * [Application] Fix net6 nre * Cleanuo * Fix build again * [Samples] Add essentials init * Fix net6 build * - update packagese * - add handler renderer shim * - fix link references * Fix running app on Android * - fix missing using * - shim sample * - add another helper * [Hosting] Save context on App for now * [Handlers] Fix sample register ISwitch * [Hosting] Some renaming * - delete samples * - fix CG * [Hosting] Remove old registrar code * Remove FormsHandlers * TODO: Implement legacy attribute scanner with AppHostBuilder * Fix build * Enable nullable * fix formatting * Fix using old registrar * use c# 9 * Try fix #nullable * Don't disable nullable warnings Use the null-forgiving operator (!) to rather swear that we doin' good * Fixed the benchmarks and tests with new code Also split the benchmarks into separate classes for better comparison. * Fixing some merge issues * Remove usage of FormsHandlers * [Hosting] Small refactor , fixing same names * remove this * [Hosting] Fix MauiHandlersServiceProvider Co-authored-by: Pedro Jesus <pedrojesus.cefet@gmail.com> Co-authored-by: Shane Neuville <shneuvil@microsoft.com> Co-authored-by: Matthew Leibowitz <mattleibow@live.com>
2021-02-23 23:05:46 +03:00
EndGlobalSection
Setup Maui.sln with a set of net6 projects (#13433) * net6 projects * - additional * - net6 nullable fixes * - provision sdks * - net6.0 * - change to 5.0.0 * - update cake provisioning * - net6 fixes * - fix up platform heads * - fix global.json * - add net6 nuget feeds * - fix up platform heads and net6 if defs * - simplify * - add dotnet core build of maui sln * - update readme * - net6 yaml target * - remove net6 build from nuget * - simplify provisioning * - write json file * - net6 via yaml * - fix parameters * - more boots * - yaml * - base yaml pipeline off net6-samples * - yaml yaml yaml * - mac yaml * - add binlogs * - set AndroidRestoreOnBuild to false * - browser assembly * - fix artifacts directories * - fix NET6 artifacts * - update to preview bits * Update handlers.yml * [Build]Deploy android sample app * - restore from devops config Co-authored-by: Rui Marinho <me@ruimarinho.net>
2021-02-11 01:24:09 +03:00
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {0B8ABEAD-D2B5-4370-A187-62B5ABE4EE50}
EndGlobalSection
EndGlobal