Skip to content

Commit

Permalink
updated implementation
Browse files Browse the repository at this point in the history
migrated EF to EF core


added missing mappings from model to viewmodel


dependency shuffle


fixed sqlite not being loaded because of missing dll


moved log files


removed EF references from app.config


added missing log project to source control

fixed missing icon

moved seeding to viewmodels, fixed relations

added error handling to youtube api for missing credentials

disabled updates for debug configuration

bugfix MediaItem

added local file support

bugfix mediaplayer

fixed audiovolume slider

updated nuget packages

fixed playing and resuming button

working on saving state

updated nuget package

updated nuget package

updated nuget package

updated nuget packages
  • Loading branch information
Insire committed May 5, 2019
1 parent ba074ff commit 032ec0e
Show file tree
Hide file tree
Showing 246 changed files with 2,235 additions and 7,642 deletions.
1 change: 1 addition & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ end_of_line = crlf

# Dotnet code style settings:
[*.{cs,vb}]
charset = utf-8
# Sort using and Import directives with System.* appearing first
dotnet_sort_system_directives_first = true
# Avoid "this." and "Me." if not necessary
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -226,3 +226,5 @@ ModelManifest.xml

# Merge
*.orig

!Maple.Log
20 changes: 16 additions & 4 deletions Maple.sln
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Maple", "src\Maple\Maple.csproj", "{FBD5595B-6859-4E8E-BDFA-C3169EF34985}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Maple.Core", "src\Maple.Core\Maple.Core.csproj", "{21FA5854-0692-42E2-924E-A38CF3C7FF71}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Maple.Core", "src\Maple.Core\Maple.Core.csproj", "{21FA5854-0692-42E2-924E-A38CF3C7FF71}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Maple.Data", "src\Maple.Data\Maple.Data.csproj", "{B3CD46BE-3C08-4BAE-AE60-A6D84A62400C}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Maple.Data", "src\Maple.Data\Maple.Data.csproj", "{B3CD46BE-3C08-4BAE-AE60-A6D84A62400C}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Maple.Localization", "src\Maple.Localization\Maple.Localization.csproj", "{A073FC92-90E3-4541-8B52-6F7293187871}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Maple.Localization", "src\Maple.Localization\Maple.Localization.csproj", "{A073FC92-90E3-4541-8B52-6F7293187871}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Maple.Youtube", "src\Maple.Youtube\Maple.Youtube.csproj", "{B5BE546F-8D9F-4FB9-B235-AF05FD553F9E}"
EndProject
Expand All @@ -31,7 +31,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Cake", "Cake", "{E463B2A9-3
Cake\tools\packages.config = Cake\tools\packages.config
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Maple.Domain", "src\Maple.Domain\Maple.Domain.csproj", "{9D7D05A6-8271-4836-A7BB-5B2ABECCBD81}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Maple.Domain", "src\Maple.Domain\Maple.Domain.csproj", "{9D7D05A6-8271-4836-A7BB-5B2ABECCBD81}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Maple.Log", "src\Maple.Log\Maple.Log.csproj", "{8C3E9110-FFB8-4656-9A19-B763C0868278}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Maple.Icons", "src\Maple.Icons\Maple.Icons.csproj", "{1570D024-DDE5-4BBA-BC01-F47D47535B53}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down Expand Up @@ -67,6 +71,14 @@ Global
{9D7D05A6-8271-4836-A7BB-5B2ABECCBD81}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9D7D05A6-8271-4836-A7BB-5B2ABECCBD81}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9D7D05A6-8271-4836-A7BB-5B2ABECCBD81}.Release|Any CPU.Build.0 = Release|Any CPU
{8C3E9110-FFB8-4656-9A19-B763C0868278}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8C3E9110-FFB8-4656-9A19-B763C0868278}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8C3E9110-FFB8-4656-9A19-B763C0868278}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8C3E9110-FFB8-4656-9A19-B763C0868278}.Release|Any CPU.Build.0 = Release|Any CPU
{1570D024-DDE5-4BBA-BC01-F47D47535B53}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1570D024-DDE5-4BBA-BC01-F47D47535B53}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1570D024-DDE5-4BBA-BC01-F47D47535B53}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1570D024-DDE5-4BBA-BC01-F47D47535B53}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
1 change: 1 addition & 0 deletions src/Maple.Core/Commands/AsyncCommandBase.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ namespace Maple.Core
public abstract class AsyncCommandBase : IAsyncCommand
{
public abstract bool CanExecute(object parameter);

public abstract Task ExecuteAsync(object parameter);

public async void Execute(object parameter)
Expand Down
1 change: 1 addition & 0 deletions src/Maple.Core/Commands/Obsolete/AsyncRelayCommand.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
using System.Diagnostics;
using System.Threading.Tasks;
using System.Windows.Input;

using Maple.Localization.Properties;

namespace Maple.Core
Expand Down
1 change: 1 addition & 0 deletions src/Maple.Core/Commands/RelayCommand.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using System;
using System.Diagnostics;
using System.Windows.Input;

using Maple.Localization.Properties;

namespace Maple.Core
Expand Down
Loading

0 comments on commit 032ec0e

Please sign in to comment.