Skip to content
This repository was archived by the owner on Oct 6, 2020. It is now read-only.

Avalonia #141

Open
wants to merge 11 commits into
base: dev
Choose a base branch
from
Open

Avalonia #141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
dc6d492
Refactoring ui
StanleyGoldman Nov 28, 2019
9ac3f65
Adding an avalonia project
StanleyGoldman Nov 26, 2019
b91243e
Moving project
StanleyGoldman Nov 26, 2019
b170e43
Moving some more stuff around
StanleyGoldman Nov 26, 2019
cb688aa
Adding alternate solution
StanleyGoldman Nov 26, 2019
bf1fc32
Fixing other build errors
StanleyGoldman Nov 26, 2019
5a7ccbd
Progress
StanleyGoldman Nov 26, 2019
15a6d6d
Configured Avalonia project
StanleyGoldman Nov 26, 2019
69c50e7
Update after merge
StanleyGoldman Nov 26, 2019
8df7aec
Adding a dockpanel and menu
StanleyGoldman Nov 27, 2019
f3e6ab2
Adding avalonia nightly feed
StanleyGoldman Nov 28, 2019
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
109 changes: 109 additions & 0 deletions SonOfPicasso.Avalonia.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,109 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.29215.179
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{12E2CEF6-EB9D-412F-98E3-ECBBBD00A29A}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SonOfPicasso.Testing.Common", "src\SonOfPicasso.Testing.Common\SonOfPicasso.Testing.Common.csproj", "{0D73C26E-D1F1-4DE7-8354-9C9549FD2F93}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SonOfPicasso.Core", "src\SonOfPicasso.Core\SonOfPicasso.Core.csproj", "{DD6FAB82-72D4-4556-A4C3-EBCD49C89598}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{30DC3442-C225-4FC5-9439-77BD1B3EE895}"
ProjectSection(SolutionItems) = preProject
appveyor.yml = appveyor.yml
Build.fsx = Build.fsx
codecov.yml = codecov.yml
.chglog\config.yml = .chglog\config.yml
nuget.config = nuget.config
paket.dependencies = paket.dependencies
paket.lock = paket.lock
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{DE25AC0A-8FB7-4D88-8B3A-CDC3EF9AE88F}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SonOfPicasso.Tools", "src\SonOfPicasso.Tools\SonOfPicasso.Tools.csproj", "{2BA6995C-ED7F-4636-9DEA-0D8EE2504771}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SonOfPicasso.Data", "src\SonOfPicasso.Data\SonOfPicasso.Data.csproj", "{2096BF8B-3C6C-4CBC-803D-F51B9D5209B3}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SonOfPicasso.Data.Tests", "src\SonOfPicasso.Data.Tests\SonOfPicasso.Data.Tests.csproj", "{1D87A79F-C5D4-4EA0-B978-13E942B9CEE9}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SonOfPicasso.Core.Tests", "src\SonOfPicasso.Core.Tests\SonOfPicasso.Core.Tests.csproj", "{2F6B9B2C-D228-4563-B74C-12C18E753361}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SonOfPicasso.UI.Tests", "src\SonOfPicasso.UI.Tests\SonOfPicasso.UI.Tests.csproj", "{9D06ACFE-6ECD-4EC9-9CA9-8D6CCC5C362A}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SonOfPicasso.Tools.Tests", "src\SonOfPicasso.Tools.Tests\SonOfPicasso.Tools.Tests.csproj", "{46317863-37D4-46EB-AEBD-57AD986F8EEB}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SonOfPicasso.Integration.Tests", "src\SonOfPicasso.Integration.Tests\SonOfPicasso.Integration.Tests.csproj", "{BC32339A-4C41-420C-8812-E84FD2608954}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SonOfPicasso.UI.Avalonia", "src\SonOfPicasso.UI.Avalonia\SonOfPicasso.UI.Avalonia.csproj", "{AB7C1153-7474-4591-8708-EE1A4EA34E1E}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SonOfPicasso.UI", "src\SonOfPicasso.UI\SonOfPicasso.UI.csproj", "{7599C0FD-62B6-458F-983E-6930BFCBCF71}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{0D73C26E-D1F1-4DE7-8354-9C9549FD2F93}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0D73C26E-D1F1-4DE7-8354-9C9549FD2F93}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0D73C26E-D1F1-4DE7-8354-9C9549FD2F93}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0D73C26E-D1F1-4DE7-8354-9C9549FD2F93}.Release|Any CPU.Build.0 = Release|Any CPU
{DD6FAB82-72D4-4556-A4C3-EBCD49C89598}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{DD6FAB82-72D4-4556-A4C3-EBCD49C89598}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DD6FAB82-72D4-4556-A4C3-EBCD49C89598}.Release|Any CPU.ActiveCfg = Release|Any CPU
{DD6FAB82-72D4-4556-A4C3-EBCD49C89598}.Release|Any CPU.Build.0 = Release|Any CPU
{2BA6995C-ED7F-4636-9DEA-0D8EE2504771}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2BA6995C-ED7F-4636-9DEA-0D8EE2504771}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2BA6995C-ED7F-4636-9DEA-0D8EE2504771}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2BA6995C-ED7F-4636-9DEA-0D8EE2504771}.Release|Any CPU.Build.0 = Release|Any CPU
{2096BF8B-3C6C-4CBC-803D-F51B9D5209B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2096BF8B-3C6C-4CBC-803D-F51B9D5209B3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2096BF8B-3C6C-4CBC-803D-F51B9D5209B3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2096BF8B-3C6C-4CBC-803D-F51B9D5209B3}.Release|Any CPU.Build.0 = Release|Any CPU
{1D87A79F-C5D4-4EA0-B978-13E942B9CEE9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1D87A79F-C5D4-4EA0-B978-13E942B9CEE9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1D87A79F-C5D4-4EA0-B978-13E942B9CEE9}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1D87A79F-C5D4-4EA0-B978-13E942B9CEE9}.Release|Any CPU.Build.0 = Release|Any CPU
{2F6B9B2C-D228-4563-B74C-12C18E753361}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2F6B9B2C-D228-4563-B74C-12C18E753361}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2F6B9B2C-D228-4563-B74C-12C18E753361}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2F6B9B2C-D228-4563-B74C-12C18E753361}.Release|Any CPU.Build.0 = Release|Any CPU
{9D06ACFE-6ECD-4EC9-9CA9-8D6CCC5C362A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9D06ACFE-6ECD-4EC9-9CA9-8D6CCC5C362A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9D06ACFE-6ECD-4EC9-9CA9-8D6CCC5C362A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9D06ACFE-6ECD-4EC9-9CA9-8D6CCC5C362A}.Release|Any CPU.Build.0 = Release|Any CPU
{46317863-37D4-46EB-AEBD-57AD986F8EEB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{46317863-37D4-46EB-AEBD-57AD986F8EEB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{46317863-37D4-46EB-AEBD-57AD986F8EEB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{46317863-37D4-46EB-AEBD-57AD986F8EEB}.Release|Any CPU.Build.0 = Release|Any CPU
{BC32339A-4C41-420C-8812-E84FD2608954}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BC32339A-4C41-420C-8812-E84FD2608954}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BC32339A-4C41-420C-8812-E84FD2608954}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BC32339A-4C41-420C-8812-E84FD2608954}.Release|Any CPU.Build.0 = Release|Any CPU
{AB7C1153-7474-4591-8708-EE1A4EA34E1E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{AB7C1153-7474-4591-8708-EE1A4EA34E1E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{AB7C1153-7474-4591-8708-EE1A4EA34E1E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{AB7C1153-7474-4591-8708-EE1A4EA34E1E}.Release|Any CPU.Build.0 = Release|Any CPU
{7599C0FD-62B6-458F-983E-6930BFCBCF71}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7599C0FD-62B6-458F-983E-6930BFCBCF71}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7599C0FD-62B6-458F-983E-6930BFCBCF71}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7599C0FD-62B6-458F-983E-6930BFCBCF71}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{0D73C26E-D1F1-4DE7-8354-9C9549FD2F93} = {12E2CEF6-EB9D-412F-98E3-ECBBBD00A29A}
{2BA6995C-ED7F-4636-9DEA-0D8EE2504771} = {DE25AC0A-8FB7-4D88-8B3A-CDC3EF9AE88F}
{1D87A79F-C5D4-4EA0-B978-13E942B9CEE9} = {12E2CEF6-EB9D-412F-98E3-ECBBBD00A29A}
{2F6B9B2C-D228-4563-B74C-12C18E753361} = {12E2CEF6-EB9D-412F-98E3-ECBBBD00A29A}
{9D06ACFE-6ECD-4EC9-9CA9-8D6CCC5C362A} = {12E2CEF6-EB9D-412F-98E3-ECBBBD00A29A}
{46317863-37D4-46EB-AEBD-57AD986F8EEB} = {12E2CEF6-EB9D-412F-98E3-ECBBBD00A29A}
{BC32339A-4C41-420C-8812-E84FD2608954} = {12E2CEF6-EB9D-412F-98E3-ECBBBD00A29A}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {2C01583D-05D7-4F03-A86C-ECF79DA041D0}
EndGlobalSection
EndGlobal
24 changes: 18 additions & 6 deletions SonOfPicasso.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.29215.179
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SonOfPicasso.UI", "src\SonOfPicasso.UI\SonOfPicasso.UI.csproj", "{282F684E-B70E-4C4B-920A-06D3E96F3109}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{12E2CEF6-EB9D-412F-98E3-ECBBBD00A29A}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SonOfPicasso.Testing.Common", "src\SonOfPicasso.Testing.Common\SonOfPicasso.Testing.Common.csproj", "{0D73C26E-D1F1-4DE7-8354-9C9549FD2F93}"
Expand Down Expand Up @@ -39,16 +37,18 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SonOfPicasso.Tools.Tests",
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SonOfPicasso.Integration.Tests", "src\SonOfPicasso.Integration.Tests\SonOfPicasso.Integration.Tests.csproj", "{BC32339A-4C41-420C-8812-E84FD2608954}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SonOfPicasso.UI.Avalonia", "src\SonOfPicasso.UI.Avalonia\SonOfPicasso.UI.Avalonia.csproj", "{AB7C1153-7474-4591-8708-EE1A4EA34E1E}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SonOfPicasso.UI.WPF", "src\SonOfPicasso.UI.WPF\SonOfPicasso.UI.WPF.csproj", "{AFAD5D51-9063-46BE-B489-9222C9C1BE2B}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SonOfPicasso.UI", "src\SonOfPicasso.UI\SonOfPicasso.UI.csproj", "{7599C0FD-62B6-458F-983E-6930BFCBCF71}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{282F684E-B70E-4C4B-920A-06D3E96F3109}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{282F684E-B70E-4C4B-920A-06D3E96F3109}.Debug|Any CPU.Build.0 = Debug|Any CPU
{282F684E-B70E-4C4B-920A-06D3E96F3109}.Release|Any CPU.ActiveCfg = Release|Any CPU
{282F684E-B70E-4C4B-920A-06D3E96F3109}.Release|Any CPU.Build.0 = Release|Any CPU
{0D73C26E-D1F1-4DE7-8354-9C9549FD2F93}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0D73C26E-D1F1-4DE7-8354-9C9549FD2F93}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0D73C26E-D1F1-4DE7-8354-9C9549FD2F93}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand Down Expand Up @@ -85,6 +85,18 @@ Global
{BC32339A-4C41-420C-8812-E84FD2608954}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BC32339A-4C41-420C-8812-E84FD2608954}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BC32339A-4C41-420C-8812-E84FD2608954}.Release|Any CPU.Build.0 = Release|Any CPU
{AB7C1153-7474-4591-8708-EE1A4EA34E1E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{AB7C1153-7474-4591-8708-EE1A4EA34E1E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{AB7C1153-7474-4591-8708-EE1A4EA34E1E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{AB7C1153-7474-4591-8708-EE1A4EA34E1E}.Release|Any CPU.Build.0 = Release|Any CPU
{AFAD5D51-9063-46BE-B489-9222C9C1BE2B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{AFAD5D51-9063-46BE-B489-9222C9C1BE2B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{AFAD5D51-9063-46BE-B489-9222C9C1BE2B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{AFAD5D51-9063-46BE-B489-9222C9C1BE2B}.Release|Any CPU.Build.0 = Release|Any CPU
{7599C0FD-62B6-458F-983E-6930BFCBCF71}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7599C0FD-62B6-458F-983E-6930BFCBCF71}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7599C0FD-62B6-458F-983E-6930BFCBCF71}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7599C0FD-62B6-458F-983E-6930BFCBCF71}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
1 change: 1 addition & 0 deletions nuget.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<configuration>
<packageSources>
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
<add key="avalonia-nightly" value="https://www.myget.org/F/avalonia-ci/api/v2" />
<!-- <add key="Custom Packages" value="lib" /> -->
</packageSources>
<activePackageSource>
Expand Down
1 change: 1 addition & 0 deletions src/SonOfPicasso.Integration.Tests/SonOfPicasso.Integration.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
<PackageReference Include="NSubstitute" Version="4.2.1" />
<PackageReference Include="NSubstitute.Analyzers.CSharp" Version="1.0.11" />
<PackageReference Include="ReactiveUI" Version="10.5.31" />
<PackageReference Include="Serilog" Version="2.9.0" />
<PackageReference Include="Serilog.Filters.Expressions" Version="2.0.0" />
<PackageReference Include="Splat.Autofac" Version="9.2.7" />
Expand Down
Loading