Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reworked generator to separate parts into different modules #325

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
71 changes: 51 additions & 20 deletions Fabulous.sln
Original file line number Diff line number Diff line change
Expand Up @@ -3,73 +3,73 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.27004.2006
MinimumVisualStudioVersion = 10.0.40219.1
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fabulous.Core", "src\Fabulous.Core\Fabulous.Core.fsproj", "{B459AFAD-BB5B-43C3-BD86-609E8DB3E3FD}"
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Fabulous.Core", "src\Fabulous.Core\Fabulous.Core.fsproj", "{B459AFAD-BB5B-43C3-BD86-609E8DB3E3FD}"
EndProject
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fabulous.LiveUpdate", "src\Fabulous.LiveUpdate\Fabulous.LiveUpdate.fsproj", "{B459AFAD-BB5B-43C3-BD86-609E8DB3E3F1}"
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Fabulous.LiveUpdate", "src\Fabulous.LiveUpdate\Fabulous.LiveUpdate.fsproj", "{B459AFAD-BB5B-43C3-BD86-609E8DB3E3F1}"
EndProject
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fabulous.Maps", "extensions\Maps\Fabulous.Maps.fsproj", "{B459AFAD-BB5B-43C3-BD86-609E8DB3E3FE}"
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Fabulous.Maps", "extensions\Maps\Fabulous.Maps.fsproj", "{B459AFAD-BB5B-43C3-BD86-609E8DB3E3FE}"
EndProject
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fabulous.SkiaSharp", "extensions\SkiaSharp\Fabulous.SkiaSharp.fsproj", "{B459AFAD-BB5B-43C3-BD86-609E8DB3E3FF}"
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Fabulous.SkiaSharp", "extensions\SkiaSharp\Fabulous.SkiaSharp.fsproj", "{B459AFAD-BB5B-43C3-BD86-609E8DB3E3FF}"
EndProject
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fabulous.OxyPlot", "extensions\OxyPlot\Fabulous.OxyPlot.fsproj", "{B459AFAD-BB5B-43C3-BD86-609E8DB3E3F0}"
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Fabulous.OxyPlot", "extensions\OxyPlot\Fabulous.OxyPlot.fsproj", "{B459AFAD-BB5B-43C3-BD86-609E8DB3E3F0}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{FB194A8D-00A6-4416-AA8D-A89C1541935B}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "StaticView", "StaticView", "{FB194A8D-00A6-4416-AA8D-A89C1541935C}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "StaticViewCounterApp", "StaticViewCounterApp", "{A832662D-05EB-4582-B871-143798897673}"
EndProject
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "StaticViewCounterApp", "samples\StaticView\StaticViewCounterApp\StaticViewCounterApp\StaticViewCounterApp.fsproj", "{4282E90F-2519-46D0-B593-D57CFCA36A2D}"
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "StaticViewCounterApp", "samples\StaticView\StaticViewCounterApp\StaticViewCounterApp\StaticViewCounterApp.fsproj", "{4282E90F-2519-46D0-B593-D57CFCA36A2D}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "StaticViewCounterApp.Droid", "samples\StaticView\StaticViewCounterApp\Droid\StaticViewCounterApp.Droid.fsproj", "{2D3CBBD7-118F-4457-817E-0D60E03C5534}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "StaticViewCounterApp.iOS", "samples\StaticView\StaticViewCounterApp\iOS\StaticViewCounterApp.iOS.fsproj", "{71C30453-89CF-4955-8DFA-F09231DD99ED}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TicTacToe", "TicTacToe", "{9869E35B-39CD-490C-A843-842C09938630}"
EndProject
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "TicTacToe", "samples\TicTacToe\TicTacToe\TicTacToe.fsproj", "{AE045D79-7FF3-45F3-BFD0-305542A1C728}"
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "TicTacToe", "samples\TicTacToe\TicTacToe\TicTacToe.fsproj", "{AE045D79-7FF3-45F3-BFD0-305542A1C728}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "TicTacToe.iOS", "samples\TicTacToe\iOS\TicTacToe.iOS.fsproj", "{E43D02E6-04E7-4E4E-A527-3C5D00D9D826}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "TicTacToe.Droid", "samples\TicTacToe\Droid\TicTacToe.Droid.fsproj", "{8E482415-A728-4B35-9C9A-31F4D3AE1D54}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AllControls", "AllControls", "{12D18417-809C-4CA9-AD3E-474333B181BC}"
EndProject
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "AllControls", "samples\AllControls\AllControls\AllControls.fsproj", "{13F140D6-2D21-41BE-AC90-4B14D8C16A47}"
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "AllControls", "samples\AllControls\AllControls\AllControls.fsproj", "{13F140D6-2D21-41BE-AC90-4B14D8C16A47}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "AllControls.Droid", "samples\AllControls\Droid\AllControls.Droid.fsproj", "{5CCD3C0C-3434-434C-B8C2-7FFDEDCC2437}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "AllControls.iOS", "samples\AllControls\iOS\AllControls.iOS.fsproj", "{9031246B-4B08-47C9-A500-30334A245272}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CounterApp", "CounterApp", "{A61655CB-26DF-47E7-BCC0-91FD9A7D83AA}"
EndProject
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "CounterApp", "samples\CounterApp\CounterApp\CounterApp.fsproj", "{AC36B11A-383D-45A3-8999-4F6475E9DD13}"
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "CounterApp", "samples\CounterApp\CounterApp\CounterApp.fsproj", "{AC36B11A-383D-45A3-8999-4F6475E9DD13}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "CounterApp.Droid", "samples\CounterApp\Droid\CounterApp.Droid.fsproj", "{13181907-1C53-47C1-BDF0-DBECCC2ED92E}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "CounterApp.iOS", "samples\CounterApp\iOS\CounterApp.iOS.fsproj", "{F557905B-B099-44AB-939C-AB169499A36E}"
EndProject
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Generator", "tools\Generator\Generator.fsproj", "{10DF5D2F-17FA-43DE-9549-B84E6CF26602}"
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Generator", "tools\Generator\Generator.fsproj", "{10DF5D2F-17FA-43DE-9549-B84E6CF26602}"
EndProject
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fabulous.Cli", "src\Fabulous.Cli\Fabulous.Cli.fsproj", "{23640E46-E830-4AB7-9289-E527F6429435}"
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Fabulous.Cli", "src\Fabulous.Cli\Fabulous.Cli.fsproj", "{23640E46-E830-4AB7-9289-E527F6429435}"
EndProject
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fabulous.Cli.Tests", "tests\Fabulous.Cli.Tests\Fabulous.Cli.Tests.fsproj", "{810EEB40-5042-4946-B695-5B13E9957807}"
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Fabulous.Cli.Tests", "tests\Fabulous.Cli.Tests\Fabulous.Cli.Tests.fsproj", "{810EEB40-5042-4946-B695-5B13E9957807}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{E75EAD35-1041-42CC-8AA4-01DB58FA467C}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1199BA9F-BF79-477F-8E25-FD0E0CBC962A}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "extensions", "extensions", "{13C0EB5D-E38E-4714-9421-77CD9C53A067}"
EndProject
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fabulous.CustomControls", "src\Fabulous.CustomControls\Fabulous.CustomControls.fsproj", "{7FF328BB-9318-4C11-8A9A-37DD98EAB35B}"
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Fabulous.CustomControls", "src\Fabulous.CustomControls\Fabulous.CustomControls.fsproj", "{7FF328BB-9318-4C11-8A9A-37DD98EAB35B}"
EndProject
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Generator.Tests", "tests\Generator.Tests\Generator.Tests.fsproj", "{1CABDDE0-BB3C-4D9C-BC95-6213F177ACB1}"
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Generator.Tests", "tests\Generator.Tests\Generator.Tests.fsproj", "{1CABDDE0-BB3C-4D9C-BC95-6213F177ACB1}"
EndProject
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "CounterApp.WPF", "samples\CounterApp\WPF\CounterApp.WPF.fsproj", "{096F85A9-9572-43FC-893C-05B9D07965A4}"
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "CounterApp.WPF", "samples\CounterApp\WPF\CounterApp.WPF.fsproj", "{096F85A9-9572-43FC-893C-05B9D07965A4}"
EndProject
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "StaticViewCounterApp.WPF", "samples\StaticView\StaticViewCounterApp\WPF\StaticViewCounterApp.WPF.fsproj", "{D139AE95-5169-4AF4-B5A5-AED084467E86}"
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "StaticViewCounterApp.WPF", "samples\StaticView\StaticViewCounterApp\WPF\StaticViewCounterApp.WPF.fsproj", "{D139AE95-5169-4AF4-B5A5-AED084467E86}"
EndProject
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "TicTacToe.WPF", "samples\TicTacToe\WPF\TicTacToe.WPF.fsproj", "{30462E1D-0584-48A0-82BA-DE8A8B168E6B}"
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "TicTacToe.WPF", "samples\TicTacToe\WPF\TicTacToe.WPF.fsproj", "{30462E1D-0584-48A0-82BA-DE8A8B168E6B}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "CounterApp.Gtk", "samples\CounterApp\Gtk\CounterApp.Gtk.fsproj", "{C6A6BA94-897C-48B5-8046-3DF33897BA94}"
EndProject
Expand All @@ -87,11 +87,11 @@ Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "TicTacToe.macOS", "samples\
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "CounterApp.macOS", "samples\CounterApp\macOS\CounterApp.macOS.fsproj", "{E9F1B013-B228-49E1-B652-6C45C6F7489B}"
EndProject
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "AllControls.WPF", "samples\AllControls\WPF\AllControls.WPF.fsproj", "{8D3A942E-7D62-4D70-B1D7-485BB243C4B5}"
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "AllControls.WPF", "samples\AllControls\WPF\AllControls.WPF.fsproj", "{8D3A942E-7D62-4D70-B1D7-485BB243C4B5}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Calculator", "Calculator", "{6C7349C4-EB3D-4AB5-A5AF-BF51DAE78581}"
EndProject
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Calculator", "samples\Calculator\Calculator\Calculator.fsproj", "{58C3A94E-459E-4CF5-AE67-B7C278578045}"
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Calculator", "samples\Calculator\Calculator\Calculator.fsproj", "{58C3A94E-459E-4CF5-AE67-B7C278578045}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Calculator.Droid", "samples\Calculator\Droid\Calculator.Droid.fsproj", "{58314FC1-D889-4B0F-B3AE-0544FADD7B3E}"
EndProject
Expand All @@ -101,7 +101,7 @@ Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Calculator.iOS", "samples\C
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Calculator.macOS", "samples\Calculator\macOS\Calculator.macOS.fsproj", "{C9F29337-EA7A-40F6-AB89-3F907431F359}"
EndProject
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Calculator.WPF", "samples\Calculator\WPF\Calculator.WPF.fsproj", "{B5F55DCC-7550-4FF5-A3A7-14BD8DBF9D74}"
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Calculator.WPF", "samples\Calculator\WPF\Calculator.WPF.fsproj", "{B5F55DCC-7550-4FF5-A3A7-14BD8DBF9D74}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AllControls.UWP", "samples\AllControls\UWP\AllControls.UWP.csproj", "{6641E98C-A57A-4710-9B52-966C7A2618FD}"
EndProject
Expand All @@ -113,6 +113,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StaticViewCounterApp.UWP",
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TicTacToe.UWP", "samples\TicTacToe\UWP\TicTacToe.UWP.csproj", "{F29D5D09-1D84-4617-A650-80E6E2C58890}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "CounterApp.Tests", "samples\CounterApp\CounterApp.Tests\CounterApp.Tests.fsproj", "{D331E698-DBA2-454A-924B-83D42D9BC10C}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -1383,6 +1385,34 @@ Global
{F29D5D09-1D84-4617-A650-80E6E2C58890}.Release|x86.ActiveCfg = Release|x86
{F29D5D09-1D84-4617-A650-80E6E2C58890}.Release|x86.Build.0 = Release|x86
{F29D5D09-1D84-4617-A650-80E6E2C58890}.Release|x86.Deploy.0 = Release|x86
{D331E698-DBA2-454A-924B-83D42D9BC10C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D331E698-DBA2-454A-924B-83D42D9BC10C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D331E698-DBA2-454A-924B-83D42D9BC10C}.Debug|ARM.ActiveCfg = Debug|Any CPU
{D331E698-DBA2-454A-924B-83D42D9BC10C}.Debug|ARM.Build.0 = Debug|Any CPU
{D331E698-DBA2-454A-924B-83D42D9BC10C}.Debug|ARM64.ActiveCfg = Debug|Any CPU
{D331E698-DBA2-454A-924B-83D42D9BC10C}.Debug|ARM64.Build.0 = Debug|Any CPU
{D331E698-DBA2-454A-924B-83D42D9BC10C}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{D331E698-DBA2-454A-924B-83D42D9BC10C}.Debug|iPhone.Build.0 = Debug|Any CPU
{D331E698-DBA2-454A-924B-83D42D9BC10C}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{D331E698-DBA2-454A-924B-83D42D9BC10C}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{D331E698-DBA2-454A-924B-83D42D9BC10C}.Debug|x64.ActiveCfg = Debug|Any CPU
{D331E698-DBA2-454A-924B-83D42D9BC10C}.Debug|x64.Build.0 = Debug|Any CPU
{D331E698-DBA2-454A-924B-83D42D9BC10C}.Debug|x86.ActiveCfg = Debug|Any CPU
{D331E698-DBA2-454A-924B-83D42D9BC10C}.Debug|x86.Build.0 = Debug|Any CPU
{D331E698-DBA2-454A-924B-83D42D9BC10C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D331E698-DBA2-454A-924B-83D42D9BC10C}.Release|Any CPU.Build.0 = Release|Any CPU
{D331E698-DBA2-454A-924B-83D42D9BC10C}.Release|ARM.ActiveCfg = Release|Any CPU
{D331E698-DBA2-454A-924B-83D42D9BC10C}.Release|ARM.Build.0 = Release|Any CPU
{D331E698-DBA2-454A-924B-83D42D9BC10C}.Release|ARM64.ActiveCfg = Release|Any CPU
{D331E698-DBA2-454A-924B-83D42D9BC10C}.Release|ARM64.Build.0 = Release|Any CPU
{D331E698-DBA2-454A-924B-83D42D9BC10C}.Release|iPhone.ActiveCfg = Release|Any CPU
{D331E698-DBA2-454A-924B-83D42D9BC10C}.Release|iPhone.Build.0 = Release|Any CPU
{D331E698-DBA2-454A-924B-83D42D9BC10C}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{D331E698-DBA2-454A-924B-83D42D9BC10C}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{D331E698-DBA2-454A-924B-83D42D9BC10C}.Release|x64.ActiveCfg = Release|Any CPU
{D331E698-DBA2-454A-924B-83D42D9BC10C}.Release|x64.Build.0 = Release|Any CPU
{D331E698-DBA2-454A-924B-83D42D9BC10C}.Release|x86.ActiveCfg = Release|Any CPU
{D331E698-DBA2-454A-924B-83D42D9BC10C}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -1435,6 +1465,7 @@ Global
{DE0EC9B1-B7F0-4B11-864D-5FE821A0E6A7} = {A61655CB-26DF-47E7-BCC0-91FD9A7D83AA}
{707CFDB4-4AF2-4082-8F29-B1127974BD0F} = {A832662D-05EB-4582-B871-143798897673}
{F29D5D09-1D84-4617-A650-80E6E2C58890} = {9869E35B-39CD-490C-A843-842C09938630}
{D331E698-DBA2-454A-924B-83D42D9BC10C} = {A61655CB-26DF-47E7-BCC0-91FD9A7D83AA}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {E142F9FB-7EA9-4866-81D4-718660BDCAEB}
Expand Down
7 changes: 7 additions & 0 deletions build.fsx
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,12 @@ Target.create "RunTests" (fun _ ->
DotNet.test id testProject
)

Target.create "RunSamplesTests" (fun _ ->
let testProjects = !! "samples/**/*Tests.fsproj"
for testProject in testProjects do
DotNet.test id testProject
)

Target.create "TestTemplatesNuGet" (fun _ ->
let restorePackageDotnetCli appName projectName pkgs =
DotNet.exec id "restore" (sprintf "%s/%s/%s.fsproj --source https://api.nuget.org/v3/index.json --source %s" appName projectName projectName pkgs) |> ignore
Expand Down Expand Up @@ -226,6 +232,7 @@ open Fake.Core.TargetOperators
"Build"
==> "TestTemplatesNuGet"
==> "BuildSamples"
==> "RunSamplesTests"
==> "Test"

Target.runOrDefault "Build"
1 change: 1 addition & 0 deletions docs/contents.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@
* [Models](models.html)
* [Update and Messages](update.html)
* [Traces and Crashes](logging.html)
* [Unit testing](testing.html)
* [Tools](tools.html)
* [Further Resources](index.html#further-resources)
Loading